wxEVT_MOUSEWHEEL is always defined, no #if needed

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

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index 825a3c35e7477fbb8333a34c5af86751f3e2fb3e..f3018b2574f79c2104a6d28e7f9883a51b2a1779 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -26,9 +26,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* headers if any */
-#include "wx/wxchar.h"
-
 /* overrides for regguts.h definitions, if any */
 /* regguts only includes standard headers if NULL is not defined, so do it
  * ourselves here */
@@ -38,6 +35,9 @@
 #include <limits.h>
 #include <string.h>
 
+/* must include this after ctype.h inclusion for CodeWarrior/Mac */
+#include "wx/wxchar.h"
+
 /*
  * Do not insert extras between the "begin" and "end" lines -- this
  * chunk is automatically extracted to be fitted into regex.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 */