* 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

ChangeLog

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

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