summaryrefslogtreecommitdiffstats
path: root/win32/win32.c
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-12 11:40:40 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-12 11:40:40 +0000
commit82f993d2ad983874e1e329f6cff390d3486138ef (patch)
treeba41f0820b8a9f15197bda93892926e86f9832a1 /win32/win32.c
parent6f58bf491a13e3bd3dd4a0132fa4e5b40520141d (diff)
downloadruby-82f993d2ad983874e1e329f6cff390d3486138ef.tar.gz
ruby-82f993d2ad983874e1e329f6cff390d3486138ef.tar.xz
ruby-82f993d2ad983874e1e329f6cff390d3486138ef.zip
* win32/win32.[hc] (rb_w32_argv_size, ...): reverted my latest change
to avoid incompatible pointer warning. (mingw32) git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-rw-r--r--win32/win32.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 784d585e1..53939d4ec 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -618,9 +618,10 @@ rb_w32_get_osfhandle(int fh)
}
int
-rb_w32_argv_size(const char *const *argv)
+rb_w32_argv_size(char *const *argv)
{
- const char *p, *const *t;
+ const char *p;
+ char *const *t;
int len, n, bs, quote;
for (t = argv, len = 0; *t; t++) {
@@ -648,10 +649,10 @@ rb_w32_argv_size(const char *const *argv)
}
char *
-rb_w32_join_argv(char *cmd, const char *const *argv)
+rb_w32_join_argv(char *cmd, char *const *argv)
{
- const char *p, *s, *const *t;
- char *q;
+ const char *p, *s;
+ char *q, *const *t;
int n, bs, quote;
for (t = argv, q = cmd; p = *t; t++) {
@@ -846,7 +847,7 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog)
}
int
-rb_w32_aspawn(int mode, const char *prog, const char *const *argv)
+rb_w32_aspawn(int mode, const char *prog, char *const *argv)
{
int len = rb_w32_argv_size(argv);
char *cmd = ALLOCA_N(char, len);