nobu	2012-06-04 14:46:24 +0900 (Mon, 04 Jun 2012)

  New Revision: 35906

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35906

  Log:
    merge definitions
    
    * process.c (proc_exec_v, rb_proc_exec_e): merge definitions.

  Modified files:
    trunk/process.c

Index: process.c
===================================================================
--- process.c	(revision 35905)
+++ process.c	(revision 35906)
@@ -1066,16 +1066,13 @@
 #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))
 
-#ifdef __native_client__
 static int
 proc_exec_v(const char *prog, VALUE argv_str, VALUE envp_str)
 {
-  rb_notimplement();
-}
+#ifdef __native_client__
+    rb_notimplement();
+    UNREACHABLE;
 #else
-static int
-proc_exec_v(const char *prog, VALUE argv_str, VALUE envp_str)
-{
     char **argv;
     char fbuf[MAXPATHLEN];
 # if defined(__EMX__) || defined(OS2)
@@ -1133,19 +1130,16 @@
     }
 # endif
     return -1;
-}
 #endif
+}
 
-#ifdef __native_client__
 static int
 rb_proc_exec_e(const char *str, VALUE envp_str)
 {
-  rb_notimplement();
-}
+#ifdef __native_client__
+    rb_notimplement();
+    UNREACHABLE;
 #else
-static int
-rb_proc_exec_e(const char *str, VALUE envp_str)
-{
     while (*str == ' ' || *str == '\t' || *str == '\n')
 	str++;
 
@@ -1184,8 +1178,8 @@
 #endif
     return -1;
 #endif	/* _WIN32 */
-}
 #endif
+}
 
 int
 rb_proc_exec(const char *str)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/