naruse	2012-09-21 18:45:52 +0900 (Fri, 21 Sep 2012)

  New Revision: 37006

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

  Log:
    merge revision(s) 33989:["7012"]
    
    * include/ruby/win32.h: undef stat to silence mingw-w64 stat
      redefinition warnings (GCC 4.6.3).

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/include/ruby/win32.h
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/include/ruby/win32.h
===================================================================
--- ruby_1_9_3/include/ruby/win32.h	(revision 37005)
+++ ruby_1_9_3/include/ruby/win32.h	(revision 37006)
@@ -126,6 +126,7 @@
 #undef fputchar
 #undef utime
 #undef lseek
+#undef stat
 #undef fstat
 #define getc(_stream)		rb_w32_getc(_stream)
 #define getchar()		rb_w32_getc(stdin)
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37005)
+++ ruby_1_9_3/ChangeLog	(revision 37006)
@@ -1,3 +1,8 @@
+Fri Sep 21 18:45:20 2012  Luis Lavena  <luislavena@g...>
+
+	* include/ruby/win32.h: undef stat to silence mingw-w64 stat
+	  redefinition warnings (GCC 4.6.3).
+
 Fri Sep 21 17:54:54 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* configure.in: add -Wall always.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37005)
+++ ruby_1_9_3/version.h	(revision 37006)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 271
+#define RUBY_PATCHLEVEL 272
 
 #define RUBY_RELEASE_DATE "2012-09-21"
 #define RUBY_RELEASE_YEAR 2012

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