X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbeb9303dd7c2e874212435aa565f14a6c1d4c07..3281bf677914de79543d590b89cd275573c2c6df:/src/regex/regcustom.h

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index f3018b2574..cd77bf6dbe 100644
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -36,6 +36,7 @@
 #include <string.h>
 
 /* must include this after ctype.h inclusion for CodeWarrior/Mac */
+#include "wx/defs.h"
 #include "wx/wxchar.h"
 
 /*
@@ -70,18 +71,12 @@
 #endif
 #if wxUSE_UNICODE
 #   define  __REG_WIDE_T        wxChar
-#   define  __REG_WIDE_COMPILE  re_comp
-#   define  __REG_WIDE_EXEC     re_exec
+#   define  __REG_WIDE_COMPILE  wx_re_comp
+#   define  __REG_WIDE_EXEC     wx_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
-
-/* under FreeBSD re_comp and re_exec are declared (differently) in unistd.h */
-#ifdef __FreeBSD__
-#define re_comp wx_re_comp
-#define re_exec wx_re_exec
-#endif
 /* --- end --- */
 
 /* internal character type and related */
@@ -119,8 +114,8 @@ typedef int celt;               /* type to hold chr, MCCE number, or NOCELT */
 #define iscspace(x)     ((wxUChar)(x) < 128 && isspace(x))
 
 /* name the external functions */
-#define compile         re_comp
-#define exec            re_exec
+#define compile         wx_re_comp
+#define exec            wx_re_exec
 
 /* enable/disable debugging code (by whether REG_DEBUG is defined or not) */
 #if 0           /* no debug unless requested by makefile */