1 files changed, 13 insertions, 2 deletions
diff --git a/regex.h b/regex.h
index 32d04789b0..d2877937ca 100644
--- a/regex.h
+++ b/regex.h
@@ -5,13 +5,24 @@
   $Author$
   $Date$
 
-  Copyright (C) 1993-2004 Yukihiro Matsumoto
+  Copyright (C) 1993-2005 Yukihiro Matsumoto
 
 **********************************************************************/
 
 #ifndef REGEX_H
 #define REGEX_H
 
-#include "oniggnu.h"
+#include "oniguruma.h"
+
+#ifndef ONIG_RUBY_M17N
+
+ONIG_EXTERN OnigEncoding    OnigEncDefaultCharEncoding;
+
+#undef ismbchar
+#define ismbchar(c) (mbclen((c)) != 1)
+#define mbclen(c)  \
+  ONIGENC_MBC_ENC_LEN(OnigEncDefaultCharEncoding, (UChar* )(&c))
+
+#endif /* ifndef ONIG_RUBY_M17N */
 
 #endif /* !REGEX_H */