diff options
| author | arton <arton@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-28 15:15:32 +0000 |
|---|---|---|
| committer | arton <arton@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-28 15:15:32 +0000 |
| commit | e59654c24b756beee29fe7b48a42f0ae22a7ba1e (patch) | |
| tree | a418725739719977fd8f3bd44fe5095416c4d54b | |
| parent | 667833711bc7784f4d7972bbf64332011863ad5b (diff) | |
| download | ruby-e59654c24b756beee29fe7b48a42f0ae22a7ba1e.tar.gz | |
* include/ruby/win32.h: define WIN32 if neither _WIN64 nor WIN32 defined. it forces to use push/pop for pack(4) pragma.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/win32.h | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Mar 1 00:12:49 2011 Tajima Akio <artonx@yahoo.co.jp> + + * include/ruby/win32.h: define WIN32 if neither _WIN64 nor WIN32 + defined. it forces to use push/pop for pack(4) pragma. + Mon Feb 28 23:52:13 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * test/testunit/test_rake_integration.rb (test_with_rake_runner): diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 9b1c46de18..051e9e9814 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -34,6 +34,9 @@ extern "C" { #if defined(__cplusplus) && defined(_MSC_VER) extern "C++" { /* template without extern "C++" */ #endif +#if !defined(_WIN64) && !defined(WIN32) +#define WIN32 +#endif #include <winsock2.h> #include <ws2tcpip.h> #if defined(__cplusplus) && defined(_MSC_VER) |