Permalink
Browse files

merge revision(s) 28144:

	* configure.in: should replace COMMON_HEADERS if --with-winsock2 is
	  specified.  [ruby-dev:41521]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@28223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 57ecb8e commit c50d64d05484069a7c9c27d275c7c9f2493c765e @shyouhei shyouhei committed Jun 8, 2010
Showing with 14 additions and 3 deletions.
  1. +9 −0 ChangeLog
  2. +1 −1 Makefile.in
  3. +3 −1 configure.in
  4. +1 −1 version.h
View
@@ -1,3 +1,12 @@
+Tue Jun 8 18:08:18 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * Makefile.in (fake.rb): double the backslash.
+
+Tue Jun 8 18:08:15 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@gmail.com>
* io.c, eval.c, process.c: remove all condition of r26371.
View
@@ -134,7 +134,7 @@ fake.rb: Makefile
if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
class File; \
remove_const :ALT_SEPARATOR; \
- ALT_SEPARATOR = "\\"; \
+ ALT_SEPARATOR = "\\\\"; \
end; \
end; \
' > $@
View
@@ -217,6 +217,9 @@ cygwin*|mingw*)
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 @@ case "$target_os" in
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)'
View
@@ -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

0 comments on commit c50d64d

Please sign in to comment.