* regex.c: conform to C89 pointer rules

2 files changed, 7 insertions, 2 deletions

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;
           }