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 | da741692c8a9287cb914ba3b2547bd4c0225b337 (patch) | |
| tree | 413166e03fbc544dfc91bfb45628cf70dc51351b /regint.h | |
| parent | 7617a34661ad305ed8f6707755ff2caf26b45b8a (diff) | |
| download | ruby-da741692c8a9287cb914ba3b2547bd4c0225b337.tar.gz ruby-da741692c8a9287cb914ba3b2547bd4c0225b337.tar.xz ruby-da741692c8a9287cb914ba3b2547bd4c0225b337.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@12383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regint.h')
| -rw-r--r-- | regint.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |