summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 16:21:16 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 16:21:16 +0000
commit91e3f371009f9da6f685fd4ca10f72eb1a46a12d (patch)
tree3f73beeff9a1a775d425c6219cddb5d5bed498a2 /win32
parentf2af1c58158c45b0f7273158e86b3c749f1138f5 (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
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub2
1 files changed, 1 insertions, 1 deletions
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