summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c2bcdab59..b7b413c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 28 16:49:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (CreateChild, overlapped_socket_io): suppress
+ warnings.
+
Mon Jul 28 16:06:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (MAXPATHLEN): define before use.
diff --git a/win32/win32.c b/win32/win32.c
index dba0c71ce..942f01513 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1021,7 +1021,7 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
prog = cmd;
for (;;) {
if (!*prog) {
- p = dln_find_exe(cmd, NULL);
+ p = dln_find_exe_r(cmd, NULL, fbuf, sizeof(fbuf));
break;
}
if (strchr(".:*?\"/\\", *prog)) {
@@ -1038,7 +1038,7 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
p = ALLOCA_N(char, len + 1);
memcpy(p, cmd, len);
p[len] = 0;
- p = dln_find_exe(p, NULL);
+ p = dln_find_exe_r(p, NULL, fbuf, sizeof(fbuf));
break;
}
prog++;
@@ -2432,7 +2432,7 @@ overlapped_socket_io(BOOL input, int fd, char *buf, int len, int flags,
int r;
int ret;
int mode;
- int flg;
+ DWORD flg;
WSAOVERLAPPED wol;
WSABUF wbuf;
int err;