applied patch 939076: __SMARTPHONE__ define

[wxWidgets.git] / src / regex / regex.h

diff --git a/src/regex/regex.h b/src/regex/regex.h
index 8289a500ebb82e8172acd08c2bd76ecb36c4b06c..8f83871638f11213e8c4507ecd62acd159b45ac6 100644 (file)
--- a/src/regex/regex.h
+++ b/src/regex/regex.h
@@ -107,18 +107,14 @@ extern "C" {
 #ifdef __REG_NOCHAR
 #undef __REG_NOCHAR
 #endif
 #ifdef __REG_NOCHAR
 #undef __REG_NOCHAR
 #endif

-/* interface types */
-#define        __REG_WIDE_T    Tcl_UniChar
-#define        __REG_REGOFF_T  long    /* not really right, but good enough... */
-#define        __REG_VOID_T    VOID
-#define        __REG_CONST     CONST
-/* names and declarations */
-#define        __REG_WIDE_COMPILE      TclReComp
-#define        __REG_WIDE_EXEC         TclReExec
-#define        __REG_NOFRONT           /* don't want regcomp() and regexec() */
-#define        __REG_NOCHAR            /* or the char versions */
-#define        regfree         TclReFree
-#define        regerror        TclReError
+#if wxUSE_UNICODE
+#   define  __REG_WIDE_T        wxChar
+#   define  __REG_WIDE_COMPILE  re_comp
+#   define  __REG_WIDE_EXEC     re_exec
+#   define  __REG_NOCHAR        /* don't want the char versions */
+#endif
+#define __REG_NOFRONT           /* don't want regcomp() and regexec() */
+#define _ANSI_ARGS_(x)          x

 /* --- end --- */
 
 
 /* --- end --- */