nagachika	2015-01-21 05:31:03 +0900 (Wed, 21 Jan 2015)

  New Revision: 49356

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

  Log:
    merge revision(s) r44876,r47130,r48988,r48997: [Backport #10640] [Backport #10679]
    
    configure.in: use C99
    
    * configure.in: ISO9899:1999 is necessary for strtoll() on FreeBSD
      10, (and may be possibly other platforms).
    * configure.in (NET_LUID): include also ifdef.h as a workaround of
      a bug in mingw-w64 header.  [ruby-core:67103] [Bug #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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 49355)
+++ ruby_2_1/configure.in	(revision 49356)
@@ -816,10 +816,13 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L816
     ],
     [
       # ANSI (no XCFLAGS because this is C only)
-      RUBY_TRY_CFLAGS(-ansi -std=iso9899:199409, [
-        RUBY_APPEND_OPTION(warnflags, -ansi -std=iso9899:199409)
-        RUBY_APPEND_OPTION(strict_warnflags, -ansi -std=iso9899:199409)
-      ])
+	for ansi_options in -std=iso9899:1999 "-ansi -std=iso9899:199409"; do
+	    RUBY_TRY_CFLAGS(${ansi_options}, [
+		RUBY_APPEND_OPTIONS(warnflags, ${ansi_options})
+		RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
+	    ], [ansi_options=])
+	    test "x${ansi_options}" = x || break
+	done
     ])
 
     # suppress annoying -Wstrict-overflow warnings
@@ -1054,8 +1057,8 @@ main() https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L1057
 		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 <iphlpapi.h>])
+			      [@%:@include <winsock2.h>
+			      @%:@include <iphlpapi.h>])
 		if test x"$ac_cv_type_NET_LUID" = xyes; then
 		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
 		fi
@@ -2699,7 +2702,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2702
 			    RPATHFLAG=' +b %1$-s'
 			fi
 			rb_cv_dlopen=yes],
-	[solaris*], [ 	if test "$GCC" = yes; then
+	[solaris*], [	if test "$GCC" = yes; then
 			    : ${LDSHARED='$(CC) -shared'}
 			    if test "$rb_cv_prog_gnu_ld" = yes; then
 				LDFLAGS="$LDFLAGS -Wl,-E"
@@ -2818,7 +2821,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2821
 	[os2-emx*], [	LDFLAGS="$LDFLAGS -Zomf"
 			],
         [nacl], [ LDSHARED='$(CC) -shared' ],
-	[ 	: ${LDSHARED='$(LD)'}])
+	[	: ${LDSHARED='$(LD)'}])
   AC_MSG_RESULT($rb_cv_dlopen)
 fi
 if test "${LDSHAREDXX}" = ""; then
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49355)
+++ ruby_2_1/ChangeLog	(revision 49356)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Jan 21 04:36:27 2015  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]
+
+Wed Jan 21 04:36:27 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (NET_LUID): include also ifdef.h as a workaround of
+	  a bug in mingw-w64 header.  [ruby-core:67103] [Bug #10640]
+
 Wed Jan  7 22:34:52 2015  NARUSE, Yui  <naruse@r...>
 
 	* tool/config_files.rb: use config.guess in gcc repo.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49355)
+++ ruby_2_1/version.h	(revision 49356)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-01-07"
-#define RUBY_PATCHLEVEL 278
+#define RUBY_RELEASE_DATE "2015-01-21"
+#define RUBY_PATCHLEVEL 279
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44876,47130,48988,48997


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