(make_fixnum_or_float): Coerce double to int explicitly.

[bpt/emacs.git] / src / regex.c

diff --git a/src/regex.c b/src/regex.c
index ffc7912..38fc804 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -49,8 +49,12 @@
 
 /* Whether to use ISO C Amendment 1 wide char functions.
    Those should not be used for Emacs since it uses its own.  */
+#if defined _LIBC
+#define WIDE_CHAR_SUPPORT 1
+#else
 #define WIDE_CHAR_SUPPORT \
-  (defined _LIBC || HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs)
+       (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs)
+#endif
 
 /* For platform which support the ISO C amendement 1 functionality we
    support user defined character classes.  */
@@ -124,8 +128,17 @@
 # include "charset.h"
 # include "category.h"
 
+# ifdef malloc
+#  undef malloc
+# endif
 # define malloc xmalloc
+# ifdef realloc
+#  undef realloc
+# endif
 # define realloc xrealloc
+# ifdef free
+#  undef free
+# endif
 # define free xfree
 
 /* Converts the pointer to the char to BEG-based offset from the start.         */
@@ -4366,6 +4379,7 @@ mutually_exclusive_p (bufp, p1, p2)
              }
          }
       }
+      break;
       
     case charset_not:
       switch (SWITCH_ENUM_CAST (*p1))