From e8a529584197da790723f4f2f3c8c1b483f54b35 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 25 May 2007 02:13:18 +0000 Subject: [PATCH] * 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 --- ChangeLog | 8 ++++++++ regint.h | 4 +++- version.h | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42f880dd2e..0eb8ec0a12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri May 25 11:09:47 2007 NAKAMURA Usaku + + * 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 * cont.c: check across trap violation. diff --git a/regint.h b/regint.h index 927ae572b1..f76469f371 100644 --- a/regint.h +++ b/regint.h @@ -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 diff --git a/version.h b/version.h index f9583e1f0b..3c874c83dc 100644 --- a/version.h +++ b/version.h @@ -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[];