summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-15 18:51:58 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-15 18:51:58 +0000
commite5de410caf23f00ab3e12d2cd1d20b5d5ac1b48b (patch)
treea08492f183be905cc65cec4b24aef1275438a4a4
parent6ce313006791b2e804c6de79c349076b370022e5 (diff)
* win32/win32.c (NtCmdGlob): avoid VC++ warning.
* lib/mkmf.rb: add -I$(srcdir) to CPPFLAGS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/mkmf.rb2
-rw-r--r--win32/win32.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d5cee9d2f..c03bc94969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 16 03:50:33 2001 Usaku Nakamura <usa@ruby-lang.org>
+
+ * win32/win32.c (NtCmdGlob): avoid VC++ warning.
+
+ * lib/mkmf.rb: add -I$(srcdir) to CPPFLAGS.
+
Wed Aug 15 04:59:15 2001 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/*/extconf.rb: really fix so that they build from any
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 93a548fc33..2fe9d08091 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -435,7 +435,7 @@ VPATH = $(srcdir)
CC = #{CONFIG["CC"]}
CFLAGS = #{CONFIG["CCDLFLAGS"]} #{CFLAGS} #{$CFLAGS}
-CPPFLAGS = -I$(hdrdir) -I#{CONFIG["includedir"]} #{$defs.join(" ")} #{CONFIG["CPPFLAGS"]} #{$CPPFLAGS}
+CPPFLAGS = -I$(hdrdir) -I$(srcdir) -I#{CONFIG["includedir"]} #{$defs.join(" ")} #{CONFIG["CPPFLAGS"]} #{$CPPFLAGS}
CXXFLAGS = $(CFLAGS)
DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS}
LDSHARED = #{CONFIG["LDSHARED"]} #{defflag}
diff --git a/win32/win32.c b/win32/win32.c
index b67a094fe4..27f425e005 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1005,7 +1005,7 @@ NtCmdGlob (NtCmdLineElement *patt)
for (p = buf; *p; p = CharNext(p))
if (*p == '\\')
*p = '/';
- rb_globi(buf, insert, (VALUE)&listinfo);
+ rb_globi(buf, (void (*) _((const char*, VALUE)))insert, (VALUE)&listinfo);
if (buf != buffer)
free(buf);