From e8a529584197da790723f4f2f3c8c1b483f54b35 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 25 May 2007 02:13:18 +0000 Subject: * 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 --- regint.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'regint.h') 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 -- cgit v1.2.3