diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-04 05:46:24 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-04 05:46:24 +0000 |
commit | de8eb56e8851cef0c7aec56594531589f5580a7a (patch) | |
tree | 6531e3f0b787c7288e5219282fe435e71c9f91e1 | |
parent | b89e9bf5447cb47d567c7b5aa2d10b0a9352ea65 (diff) | |
download | ruby-de8eb56e8851cef0c7aec56594531589f5580a7a.tar.gz |
merge definitions
* process.c (proc_exec_v, rb_proc_exec_e): merge definitions.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | process.c | 22 |
1 files changed, 8 insertions, 14 deletions
@@ -1066,16 +1066,13 @@ exec_with_sh(const char *prog, char **argv) #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 @@ proc_exec_v(const char *prog, VALUE argv_str, VALUE envp_str) } # 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 @@ rb_proc_exec_e(const char *str, VALUE envp_str) #endif return -1; #endif /* _WIN32 */ -} #endif +} int rb_proc_exec(const char *str) |