summaryrefslogtreecommitdiff
path: root/win32/Makefile.sub
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-10 02:15:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-10 02:15:49 +0000
commit77f047ec898328b26a77cda5f1e5862604ef0d4c (patch)
treeaca419d29ac02401b78ccde43bf2c0588dc9439a /win32/Makefile.sub
parentcb7afeceed3112c46cad29cebbeb3b436b9416ab (diff)
* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
* ext/socket/extconf.rb (sockaddr_storage): remove workaround for mswin32. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
-rw-r--r--win32/Makefile.sub2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d6aafcd..8dbe5b0 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -392,7 +392,7 @@ s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: .%s.%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_HEADERS@,winsock2.h windows.h,;t t
+s,@COMMON_HEADERS@,windows.h winsock.h,;t t
s,@EXPORT_PREFIX@, ,;t t
s,@arch@,$(ARCH)-$(OS),;t t
s,@sitearch@,$(ARCH)-$(RT),;t t