diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:21:27 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:21:27 +0000 |
| commit | e740d1eead9e3828a735882deb600b066384f453 (patch) | |
| tree | 4be7942b063ba95bdcb1a80ec376cfd2cb294eea /win32 | |
| parent | b08619c82a09b204e818a16e9ad6343ef9a1b9fd (diff) | |
Tue, 12 Jan 2010 21:54:47 +0000 nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
merge revision(s) 26311
* configure.in: check for if struct timezone is defined.
* missing.h (struct timezone): define if not defined.
* win32/win32.h (struct timezone): defined in the newer w32api.
[ruby-core:27515]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/win32/win32.h b/win32/win32.h index 4e46af0cf8..dd64a63565 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -150,11 +150,9 @@ extern DWORD rb_w32_osid(void); #undef unlink #define unlink(p) rb_w32_unlink(p) +struct timezone; + #ifdef __MINGW32__ -struct timezone { - int tz_minuteswest; - int tz_dsttime; -}; #undef isascii #define isascii __isascii #endif |