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 | |
| 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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | missing.h | 7 | ||||
| -rw-r--r-- | version.h | 10 | ||||
| -rw-r--r-- | win32/win32.h | 6 |
5 files changed, 30 insertions, 10 deletions
@@ -1,3 +1,12 @@ +Wed Jan 13 06:54:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Sun Aug 15 19:59:58 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp> * lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error): diff --git a/configure.in b/configure.in index d7ed21ed03..62b34a8c62 100644 --- a/configure.in +++ b/configure.in @@ -522,7 +522,7 @@ AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \ sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \ - ucontext.h intrinsics.h) + ucontext.h intrinsics.h time.h) dnl Check additional types. AC_CHECK_SIZEOF(rlim_t, 0, [ @@ -583,6 +583,12 @@ RUBY_DEFINT(int64_t, 8) RUBY_DEFINT(uint64_t, 8, unsigned) RUBY_DEFINT(int128_t, 16) RUBY_DEFINT(uint128_t, 16, unsigned) +AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H +@%:@ include <time.h> +@%:@endif +@%:@ifdef HAVE_SYS_TIME_H +@%:@ include <sys/time.h> +@%:@endif]) dnl Checks for library functions. AC_TYPE_GETGROUPS @@ -25,6 +25,13 @@ struct timeval { # include <sys/types.h> #endif +#if !defined(HAVE_STRUCT_TIMEZONE) +struct timezone { + int tz_minuteswest; + int tz_dsttime; +}; +#endif + #ifndef HAVE_ACOSH extern double acosh _((double)); extern double asinh _((double)); @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2010-08-16" +#define RUBY_RELEASE_DATE "2010-11-22" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20100816 -#define RUBY_PATCHLEVEL 302 +#define RUBY_RELEASE_CODE 20101122 +#define RUBY_PATCHLEVEL 303 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2010 -#define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_MONTH 11 +#define RUBY_RELEASE_DAY 22 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; 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 |