diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-21 09:45:52 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-21 09:45:52 +0000 |
commit | a0a7608bb28f9dc46c6e22a0f505e5f1bd61d1fe (patch) | |
tree | 2406fcaca8aef781fc7ecf53948001b798f548c2 /include | |
parent | 9b6f7d3881032a626b9aa427fdc1a03fcc49bf23 (diff) |
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
Diffstat (limited to 'include')
-rw-r--r-- | include/ruby/win32.h | 1 |
1 files changed, 1 insertions, 0 deletions
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) |