Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca

[gnu-emacs] / src / regex.c

diff --git a/src/regex.c b/src/regex.c
index afe3751ea5e85ee2af30bac416e6d1bbae9f9eb1..472ef7279790c4aaf52f1b2956a71ae321017c8c 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -248,6 +248,7 @@ xrealloc (void *block, size_t size)
 # endif
 # define realloc xrealloc
 
+# include <stdbool.h>
 # include <string.h>
 
 /* Define the syntax stuff for \<, \>, etc.  */
@@ -535,8 +536,6 @@ typedef const unsigned char re_char;
 #endif
 
 typedef char boolean;
-#define false 0
-#define true 1
 
 static regoff_t re_match_2_internal (struct re_pattern_buffer *bufp,
                                     re_char *string1, size_t size1,