From a0a7608bb28f9dc46c6e22a0f505e5f1bd61d1fe Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 21 Sep 2012 09:45:52 +0000 Subject: [PATCH] merge revision(s) 33989:["7012"] * include/ruby/win32.h: undef stat to silence mingw-w64 stat redefinition warnings (GCC 4.6.3). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/win32.h | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index acd651b441..a2e7f43bf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 21 18:45:20 2012 Luis Lavena + + * 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 * configure.in: add -Wall always. diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 2badbbcb5c..99cdea1fc3 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -126,6 +126,7 @@ extern DWORD rb_w32_osid(void); #undef fputchar #undef utime #undef lseek +#undef stat #undef fstat #define getc(_stream) rb_w32_getc(_stream) #define getchar() rb_w32_getc(stdin) diff --git a/version.h b/version.h index 03d8b6af93..029c4bdd24 100644 --- a/version.h +++ b/version.h @@ -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