shyouhei	2010-06-08 18:26:34 +0900 (Tue, 08 Jun 2010)

  New Revision: 28223

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28223

  Log:
    merge revision(s) 28144:
    * configure.in: should replace COMMON_HEADERS if --with-winsock2 is
      specified.  [ruby-dev:41521]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/Makefile.in
    branches/ruby_1_8_7/configure.in
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/Makefile.in
===================================================================
--- ruby_1_8_7/Makefile.in	(revision 28222)
+++ ruby_1_8_7/Makefile.in	(revision 28223)
@@ -134,7 +134,7 @@
 		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
 		  class File; \
 		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\"; \
+		    ALT_SEPARATOR = "\\\\"; \
 		  end; \
 		end; \
 		' > $@
Index: ruby_1_8_7/configure.in
===================================================================
--- ruby_1_8_7/configure.in	(revision 28222)
+++ ruby_1_8_7/configure.in	(revision 28223)
@@ -217,6 +217,9 @@
 		esac], [with_winsock2=no])
 	if test "$with_winsock2" = yes; then
 	  AC_DEFINE(USE_WINSOCK2)
+	  COMMON_HEADERS="ws2tcpip.h winsock2.h windows.h"
+	else
+	  COMMON_HEADERS="windows.h winsock.h"
 	fi
     esac
     : ${enable_shared=yes}
@@ -1667,7 +1670,6 @@
 	    AC_LIBOBJ([win32])
 	    COMMON_LIBS=m
 #	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
-	    COMMON_HEADERS="windows.h winsock.h"
 	    ;;
 	esac
 	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28222)
+++ ruby_1_8_7/ChangeLog	(revision 28223)
@@ -1,3 +1,12 @@
+Tue Jun  8 18:08:18 2010  URABE Shyouhei  <shyouhei@r...>
+
+	* Makefile.in (fake.rb): double the backslash.
+
+Tue Jun  8 18:08:15 2010  NAKAMURA Usaku  <usa@r...>
+
+	* configure.in: should replace COMMON_HEADERS if --with-winsock2 is
+	  specified.  [ruby-dev:41521]
+
 Tue Jun  8 17:49:18 2010  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* io.c, eval.c, process.c: remove all condition of r26371.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28222)
+++ ruby_1_8_7/version.h	(revision 28223)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 287
+#define RUBY_PATCHLEVEL 288
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/