summaryrefslogtreecommitdiff
path: root/regint.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-25 02:13:18 (GMT)
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-25 02:13:18 (GMT)
commite8a529584197da790723f4f2f3c8c1b483f54b35 (patch)
tree413166e03fbc544dfc91bfb45628cf70dc51351b /regint.h
parente4aa7208e5b8b5aff35af4b262291ab2c39e66d9 (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
Diffstat (limited to 'regint.h')
-rw-r--r--regint.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/regint.h b/regint.h
index 927ae57..f76469f 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