summaryrefslogtreecommitdiff
path: root/regint.h
diff options
context:
space:
mode:
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 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