Fix for missing __CHAR_BIT__ under MacOS X

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

diff --git a/src/regex/regc_nfa.c b/src/regex/regc_nfa.c
index 9881cd4304de5c5ca96046c2bf7ae95a7c85faca..5f65c8d83a8ad0a0a89e3d86650b40ae2dbbc26e 100644 (file)
--- a/src/regex/regc_nfa.c
+++ b/src/regex/regc_nfa.c
@@ -972,6 +972,13 @@ struct arc *con;
  ^ #def        COMPATIBLE      3       // compatible but not satisfied yet
  ^ static int combine(struct arc *, struct arc *);
  */
+ 
+/* FIXME Required for CW 8 on Mac since it's not in limits.h */
+#ifndef __CHAR_BIT__
+#define __CHAR_BIT__ 8
+#endif
+
+ 
 static int
 combine(con, a)
 struct arc *con;

diff --git a/src/regex/rege_dfa.c b/src/regex/rege_dfa.c
index 313892cc8fc0ee2be10a5bb6b83bca27bb229431..843c5d31b217f39109846283a6be606da15c1ca8 100644 (file)
--- a/src/regex/rege_dfa.c
+++ b/src/regex/rege_dfa.c
@@ -257,6 +257,12 @@ struct dfa *d;
  ^ static struct dfa *newdfa(struct vars *, struct cnfa *,
  ^     struct colormap *, struct smalldfa *);
  */
+ 
+/* FIXME Required for CW 8 on Mac since it's not in limits.h */
+#ifndef __CHAR_BIT__
+#define __CHAR_BIT__ 8
+#endif 
+ 
 static struct dfa *
 newdfa(v, cnfa, cm, small)
 struct vars *v;

diff --git a/src/regex/regguts.h b/src/regex/regguts.h
index 36e5092367799552ad3d55ead4e996f0c5c795d4..be5041d9201f2be264497d352842fc71c2c0cd72 100644 (file)
--- a/src/regex/regguts.h
+++ b/src/regex/regguts.h
@@ -37,8 +37,6 @@
  */
 #include "regcustom.h"
 
-
-
 /*
  * Things that regcustom.h might override.
  */