From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 5 Feb 2011 05:48:19 +0000 (-0800)
Subject: * regex.c: conform to C89 pointer rules
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1035
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b0534c88840c28a4fc564d1b8c6887ee3855cdd;p=emacs.git

* regex.c: conform to C89 pointer rules
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a5e00178ce5..75113bb3c09 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* regex.c: conform to C89 pointer rules
+	(re_wctype): Add cast, as C89 does not allow assigning between
+	char * and unsigned char *.
+	(regex_compile): Likewise.
+
 	sync from gnulib to remove HAVE_STDBOOL_H
 	* config.in: Regenerate.
 
diff --git a/src/regex.c b/src/regex.c
index cb6edc2e356..9284be95ffb 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2118,7 +2118,7 @@ struct range_table_work_area
 re_wctype_t
 re_wctype (const re_char *str)
 {
-  const char *string = str;
+  const char *string = (const char *) str;
   if      (STREQ (string, "alnum"))	return RECC_ALNUM;
   else if (STREQ (string, "alpha"))	return RECC_ALPHA;
   else if (STREQ (string, "word"))	return RECC_WORD;
@@ -2700,7 +2700,7 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct
 	    main_pend = pend;
 	    main_pattern = pattern;
 	    p = pattern = whitespace_regexp;
-	    pend = p + strlen (p);
+	    pend = p + strlen ((const char *) p);
 	    break;
 	  }