diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-08-19 05:17:43 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-08-19 05:17:43 +0000 |
| commit | e668a019a7142c98d0f17b138413941827240c3e (patch) | |
| tree | cd6915c75987b0ef8a1a74001b87f432f8efe01d | |
| parent | 9cc12e803b48bf9deca912862f90d8a7b92c4d4c (diff) | |
* win32/Makefile.sub (config.status): include winsock2.h instead of
winsock.h when --with-winsock2 is specified.
fixed: [ruby-dev:29296]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
2 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sat Aug 19 14:15:02 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/Makefile.sub (config.status): include winsock2.h instead of + winsock.h when --with-winsock2 is specified. + fixed: [ruby-dev:29296] + Sat Aug 19 11:28:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_file_s_rename): use errno if set properly. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 975ef49899..db737332c2 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -424,7 +424,11 @@ 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 +!if defined(USE_WINSOCK2) +s,@COMMON_HEADERS@,winsock2.h windows.h,;t t +!else s,@COMMON_HEADERS@,windows.h winsock.h,;t t +!endif s,@DISTCLEANFILES@,vc*.pdb,;t t s,@EXPORT_PREFIX@, ,;t t s,@arch@,$(ARCH)-$(OS),;t t |