diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-10 02:15:49 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-10 02:15:49 +0000 |
| commit | 77f047ec898328b26a77cda5f1e5862604ef0d4c (patch) | |
| tree | aca419d29ac02401b78ccde43bf2c0588dc9439a | |
| parent | cb7afeceed3112c46cad29cebbeb3b436b9416ab (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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 3 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Thu Feb 10 11:14:17 2005 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h. + + * ext/socket/extconf.rb (sockaddr_storage): remove workaround for + mswin32. + Thu Feb 10 10:29:16 2005 NAKAMURA Usaku <usa@ruby-lang.org> * ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 772bf57f9f..66d7462cbf 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -123,8 +123,7 @@ end cppflags = $CPPFLAGS $CPPFLAGS += flags end - if /mswin32|mingw/ !~ RUBY_PLATFORM and - have_struct_member("struct sockaddr_storage", "ss_family", headers) + if have_struct_member("struct sockaddr_storage", "ss_family", headers) $defs[-1] = "-DHAVE_SOCKADDR_STORAGE" break elsif flags diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d6aafcd73e..8dbe5b0edb 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 |