nagachika	2014-02-11 00:26:55 +0900 (Tue, 11 Feb 2014)

  New Revision: 44905

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

  Log:
    merge revision(s) r43583: [Backport #9288]
    
    * file.c (GetLastError): already defined in windows.h on nowadays
      cygwin, and caused the confliction with the system provided
      definition on cygwin64.  by @kou1okada [Fixes GH-433].

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/file.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44904)
+++ ruby_2_0_0/ChangeLog	(revision 44905)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Feb 11 00:26:19 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (GetLastError): already defined in windows.h on nowadays
+	  cygwin, and caused the confliction with the system provided
+	  definition on cygwin64.  by @kou1okada [Fixes GH-433].
+
 Mon Feb 10 01:15:10 2014  Kouhei Sutou  <kou@c...>
 
 	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44904)
+++ ruby_2_0_0/version.h	(revision 44905)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-02-10"
-#define RUBY_PATCHLEVEL 400
+#define RUBY_RELEASE_DATE "2014-02-11"
+#define RUBY_PATCHLEVEL 401
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/file.c
===================================================================
--- ruby_2_0_0/file.c	(revision 44904)
+++ ruby_2_0_0/file.c	(revision 44905)
@@ -4182,7 +4182,6 @@ rb_file_truncate(VALUE obj, VALUE len) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L4182
 
 #ifdef __CYGWIN__
 #include <winerror.h>
-extern unsigned long __attribute__((stdcall)) GetLastError(void);
 #endif
 
 static VALUE

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43583


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