diff --git a/ChangeLog b/ChangeLog
index 4f86ed5940..4b130eccbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun  8 19:00:59 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (ARGV_COUNT): unused macro removed.
+	  (ARGV_SIZE): ditto.
+	  (ALLOC_ARGV): ditto.
+	  (ALLOC_ARGV_WITH_STR): ditto.
+
 Fri Jun  8 16:19:33 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/runner.rb (src_testdir): expand real path so that
diff --git a/process.c b/process.c
index 13c121f070..4b71998b99 100644
--- a/process.c
+++ b/process.c
@@ -1058,15 +1058,9 @@ exec_with_sh(const char *prog, char **argv, char **envp)
         execv("/bin/sh", argv); /* async-signal-safe */
 }
 
-#define ARGV_COUNT(n) ((n)+1)
 #else
 #define try_with_sh(prog, argv, envp) (void)0
-#define ARGV_COUNT(n) (n)
 #endif
-#define ARGV_SIZE(n) (sizeof(char*) * ARGV_COUNT(n))
-#define ALLOC_ARGV(n, v) ALLOCV_N(char*, (v), ARGV_COUNT(n))
-#define ALLOC_ARGV_WITH_STR(n, v, s, l) \
-    (char **)(((s) = ALLOCV_N(char, (v), ARGV_SIZE(n) + (l)) + ARGV_SIZE(n)) - ARGV_SIZE(n))
 
 /* This function should be async-signal-safe.  Actually it isn't because after_exec(). */
 static int