naruse	2014-12-25 17:33:22 +0900 (Thu, 25 Dec 2014)

  New Revision: 48998

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

  Log:
    merge revision(s) 48997: [Backport #10640]
    
    * configure.in (NET_LUID): include winsock2.h instead of windows.h.
      patch by Jon Forums in [ruby-core:67125].  [Bug #10640]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 48997)
+++ ruby_2_2/configure.in	(revision 48998)
@@ -1102,8 +1102,7 @@ main() https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L1102
 		ac_cv_func_malloc_usable_size=no
 		{ test "$target_cpu" = x64 && ac_cv_func___builtin_setjmp=no; }
 		AC_CHECK_TYPE([NET_LUID], [], [],
-			      [@%:@include <windows.h>
-			      @%:@include <ifdef.h>
+			      [@%:@include <winsock2.h>
 			      @%:@include <iphlpapi.h>])
 		if test x"$ac_cv_type_NET_LUID" = xyes; then
 		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 48997)
+++ ruby_2_2/ChangeLog	(revision 48998)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Dec 25 17:31:51 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (NET_LUID): include winsock2.h instead of windows.h.
+	  patch by Jon Forums in [ruby-core:67125].  [Bug #10640]
+
 Thu Dec 25 16:01:19 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (rb_file_expand_path_internal): drop characters ignored
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 48997)
+++ ruby_2_2/version.h	(revision 48998)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2014-12-25"
-#define RUBY_PATCHLEVEL 0
+#define RUBY_PATCHLEVEL 1
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 12

Property changes on: ruby_2_2
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk:r48997


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