[Emacs-diffs] /srv/bzr/emacs/trunk r103119: Merge: * regex.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103119 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-02-04 21:48:58 -0800
message:
  Merge: * regex.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/regex.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-05 05:07:22 +0000
+++ b/src/ChangeLog     2011-02-05 05:48:19 +0000
@@ -1,5 +1,10 @@
 2011-02-05  Paul Eggert  <address@hidden>
 
+       * 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.
 

=== modified file 'src/regex.c'
--- a/src/regex.c       2011-01-26 08:36:39 +0000
+++ b/src/regex.c       2011-02-05 05:48:19 +0000
@@ -2118,7 +2118,7 @@
 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 @@
            main_pend = pend;
            main_pattern = pattern;
            p = pattern = whitespace_regexp;
-           pend = p + strlen (p);
+           pend = p + strlen ((const char *) p);
            break;
          }