1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* regint.h (include): on some platform, defines.h redefines

Browse Source 
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
This commit is contained in:
usa 2007-05-25 02:13:18 +00:00
parent e4aa7208e5
commit e8a5295841
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Thu May 24 12:07:27 2007 Koichi Sasada <ko1@atdot.net>
* cont.c: check across trap violation. * cont.c: check across trap violation.

4
regint.h
View File

@ -80,8 +80,10 @@
/* */ /* */
/* escape other system UChar definition */ /* escape other system UChar definition */
#ifndef DEFINES_H
#include "config.h" #include "config.h"
#include "defines.h" #include "defines.h"
#endif
#ifdef ONIG_ESCAPE_UCHAR_COLLISION #ifdef ONIG_ESCAPE_UCHAR_COLLISION
#undef ONIG_ESCAPE_UCHAR_COLLISION #undef ONIG_ESCAPE_UCHAR_COLLISION
#endif #endif
@ -107,7 +109,7 @@
#define CHECK_INTERRUPT_IN_MATCH_AT #define CHECK_INTERRUPT_IN_MATCH_AT
#if defined(_WIN32) && !defined(__GNUC__) #if defined(_WIN32) && !defined(__GNUC__) && !defined(vsnprintf)
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
#endif #endif

6
version.h
View File

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #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_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070524 #define RUBY_RELEASE_CODE 20070525
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 24 #define RUBY_RELEASE_DAY 25
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];