diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:21:16 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:21:16 +0000 |
| commit | 91e3f371009f9da6f685fd4ca10f72eb1a46a12d (patch) | |
| tree | 3f73beeff9a1a775d425c6219cddb5d5bed498a2 | |
| parent | f2af1c58158c45b0f7273158e86b3c749f1138f5 (diff) | |
merge revision(s) 13678:
* {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
bug. [ruby-core:12584]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Jun 8 01:17:45 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's + bug. [ruby-core:12584] + Sun Jun 8 00:56:44 2008 GOTOU Yuuzou <gotoyuzo@notwork.org> * lib/net/http.rb, lib/open-uri.rb: remove diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 07c6bc9975..de7a2beeb8 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -389,7 +389,7 @@ s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),; 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 @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 130 +#define RUBY_PATCHLEVEL 131 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 4abfa76433..c52ec39971 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -425,7 +425,7 @@ s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}. 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 |