diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | win32/win32.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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); |