shyouhei	2008-06-08 01:22:28 +0900 (Sun, 08 Jun 2008)

  New Revision: 16883

  Modified files:
    branches/ruby_1_8_6/bcc32/Makefile.sub
    branches/ruby_1_8_6/version.h
    branches/ruby_1_8_6/win32/Makefile.sub

  Log:
    merge revision(s) 13678:
    * {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
      bug. [ruby-core:12584]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16883&r2=16882&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/bcc32/Makefile.sub?r1=16883&r2=16882&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/win32/Makefile.sub?r1=16883&r2=16882&diff_format=u

Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16882)
+++ ruby_1_8_6/version.h	(revision 16883)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 129
+#define RUBY_PATCHLEVEL 130
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/bcc32/Makefile.sub
===================================================================
--- ruby_1_8_6/bcc32/Makefile.sub	(revision 16882)
+++ ruby_1_8_6/bcc32/Makefile.sub	(revision 16883)
@@ -388,7 +388,7 @@
 s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
 s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
 s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t
+s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
 s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
 s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
 s,@EXPORT_PREFIX@,_,;t t
Index: ruby_1_8_6/win32/Makefile.sub
===================================================================
--- ruby_1_8_6/win32/Makefile.sub	(revision 16882)
+++ ruby_1_8_6/win32/Makefile.sub	(revision 16883)
@@ -424,7 +424,7 @@
 s,@RULE_SUBST@,{.;$$(srcdir);$$(topdir);$$(hdrdir)}%s,;t t
 s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS) -link $$(LDFLAGS) $$(LIBPATH) $$(XLDFLAGS),;t t
 s,@COMMON_LIBS@,m,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t
+s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
 !if defined(USE_WINSOCK2)
 s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
 !else

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/