FreeBSD compilation fixes: rename re_comp and re_exec

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index ec64f5fb6ed7772c9065a3d9d483e05703d1608d..f3018b2574f79c2104a6d28e7f9883a51b2a1779 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -76,6 +76,12 @@
 #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 */

diff --git a/src/regex/regex.h b/src/regex/regex.h
index 8f83871638f11213e8c4507ecd62acd159b45ac6..5bcda32dece22507c32854880650398b3c9b2dd7 100644 (file)
--- a/src/regex/regex.h
+++ b/src/regex/regex.h
@@ -115,6 +115,12 @@ extern "C" {
 #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 --- */