summaryrefslogtreecommitdiffstats
path: root/bcc32
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-18 03:50:47 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-18 03:50:47 +0000
commit67a762d5871c7000ce5ac4dadd7ce5249bc76ff5 (patch)
treedf68c2ee86be5de9a0a4851c9930f04b022fd455 /bcc32
parent017dab7b3f0cecf69f40f5bc5b0bafe70234cb5e (diff)
downloadruby-67a762d5871c7000ce5ac4dadd7ce5249bc76ff5.tar.gz
ruby-67a762d5871c7000ce5ac4dadd7ce5249bc76ff5.tar.xz
ruby-67a762d5871c7000ce5ac4dadd7ce5249bc76ff5.zip
* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally. [ruby-dev:26806] * win32/win32.h: include winsock2.h instead of winsock.h. (bcc32) git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32')
-rw-r--r--bcc32/Makefile.sub2
1 files changed, 1 insertions, 1 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 58048e39a..5d7b60197 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -385,7 +385,7 @@ s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.
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_HEADERS@,windows.h winsock.h,;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
s,@arch@,$(ARCH)-$(OS),;t t