archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.

Browse source 
* 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
This commit is contained in:
usa 2005-02-10 02:15:49 +00:00
parent cb7afeceed
commit 77f047ec89
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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

3
ext/socket/extconf.rb
View file

@ -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

2
win32/Makefile.sub
View file

@ -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