kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.[hc] (rb_w32_argv_size, ...): reverted my latest change

Browse source 
to avoid incompatible pointer warning. (mingw32)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-09-12 11:40:40 +00:00
parent 4409f88ad8
commit bf102e8a35
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Sep 12 20:32:00 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* win32/win32.[hc] (rb_w32_argv_size, ...): reverted my latest change
to avoid incompatible pointer warning. (mingw32)
Mon Sep 12 19:58:53 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> Mon Sep 12 19:58:53 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dln.c: avoid warning of const to non-const convertion. * dln.c: avoid warning of const to non-const convertion.

13
win32/win32.c
View file

@ -618,9 +618,10 @@ rb_w32_get_osfhandle(int fh)
} }
int 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; int len, n, bs, quote;
for (t = argv, len = 0; *t; t++) { for (t = argv, len = 0; *t; t++) {
@ -648,10 +649,10 @@ rb_w32_argv_size(const char *const *argv)
} }
char * 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; const char *p, *s;
char *q; char *q, *const *t;
int n, bs, quote; int n, bs, quote;
for (t = argv, q = cmd; p = *t; t++) { for (t = argv, q = cmd; p = *t; t++) {
@ -846,7 +847,7 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog)
} }
int 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); int len = rb_w32_argv_size(argv);
char *cmd = ALLOCA_N(char, len); char *cmd = ALLOCA_N(char, len);

8
win32/win32.h
View file

@ -187,10 +187,10 @@ extern int chown(const char *, int, int);
extern int link(const char *, const char *); extern int link(const char *, const char *);
extern int gettimeofday(struct timeval *, struct timezone *); extern int gettimeofday(struct timeval *, struct timezone *);
extern rb_pid_t waitpid (rb_pid_t, int *, int); extern rb_pid_t waitpid (rb_pid_t, int *, int);
extern int rb_w32_argv_size(const char *const *); extern int rb_w32_argv_size(char *const *);
extern char *rb_w32_join_argv(char *, const char *const *); extern char *rb_w32_join_argv(char *, char *const *);
extern int rb_w32_spawn(int, const char *, const char *); extern int rb_w32_spawn(int, const char *, const char*);
extern int rb_w32_aspawn(int, const char *, const char *const *); extern int rb_w32_aspawn(int, const char *, char *const *);
extern int kill(int, int); extern int kill(int, int);
extern int fcntl(int, int, ...); extern int fcntl(int, int, ...);
extern rb_pid_t rb_w32_getpid(void); extern rb_pid_t rb_w32_getpid(void);