diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:22:28 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:22:28 +0000 |
| commit | 0cbba017ffdc44ffac97e9d41797d485bd4bd34c (patch) | |
| tree | 9ae4618a3a2376a5d7de3b07eb3cdaa0b10954b2 /win32 | |
| parent | c69584efa45a8373dc4b379ae4041b1f21b9c50b (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_6@16883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a6df99dd1f..955f634862 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -424,7 +424,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 |