diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-25 02:13:18 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-25 02:13:18 +0000 |
commit | e8a529584197da790723f4f2f3c8c1b483f54b35 (patch) | |
tree | 413166e03fbc544dfc91bfb45628cf70dc51351b | |
parent | e4aa7208e5b8b5aff35af4b262291ab2c39e66d9 (diff) |
* regint.h (include): on some platform, defines.h redefines
SIZE_OF_LONG_LONG so souldn't re-include config.h after included
defines.h.
* regint.h (vsnprintf): ruby on windows already have vsnprintf macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | regint.h | 4 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Fri May 25 11:09:47 2007 NAKAMURA Usaku <usa@ruby-lang.org> + + * regint.h (include): on some platform, defines.h redefines + SIZE_OF_LONG_LONG so souldn't re-include config.h after included + defines.h. + + * regint.h (vsnprintf): ruby on windows already have vsnprintf macro. + Thu May 24 12:07:27 2007 Koichi Sasada <ko1@atdot.net> * cont.c: check across trap violation. @@ -80,8 +80,10 @@ /* */ /* escape other system UChar definition */ +#ifndef DEFINES_H #include "config.h" #include "defines.h" +#endif #ifdef ONIG_ESCAPE_UCHAR_COLLISION #undef ONIG_ESCAPE_UCHAR_COLLISION #endif @@ -107,7 +109,7 @@ #define CHECK_INTERRUPT_IN_MATCH_AT -#if defined(_WIN32) && !defined(__GNUC__) +#if defined(_WIN32) && !defined(__GNUC__) && !defined(vsnprintf) #define vsnprintf _vsnprintf #endif @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-05-24" +#define RUBY_RELEASE_DATE "2007-05-25" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070524 +#define RUBY_RELEASE_CODE 20070525 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |