* regcomp.c (p_ere): Workaround incorrect compiler warning.

* regerror.c (regatoi): Return non-const string or compiler complains in
certain inexplicable situations.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0d28a5b97218dc9e1405a4e0daa4642f6e9c665d..4b26c9aee3e4e1ee83972ebde799f752af6fbb5d 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-04  Christopher Faylor  <me+cygwin@cgf.cx>
+
+       * regcomp.c (p_ere): Workaround incorrect compiler warning.
+       * regerror.c (regatoi): Return non-const string or compiler complains
+       in certain inexplicable situations.
+
 2010-02-04  Corinna Vinschen  <corinna@vinschen.de>
 
        * regex/engine.c (step): Declare and define with `int ch' rather than

diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c
index 5bcaa98c38d4d96cb1b5f0c3084e29802deb4ad7..721982ab12ff1d68575b5cf47d0471eabeed69b6 100644 (file)
--- a/winsup/cygwin/regex/regcomp.c
+++ b/winsup/cygwin/regex/regcomp.c
@@ -315,8 +315,8 @@ p_ere(struct parse *p,
        int stop)               /* character this ERE should end at */
 {
        char c;
-       sopno prevback;
-       sopno prevfwd;
+       sopno prevback = 0;
+       sopno prevfwd = 0;
        sopno conc;
        int first = 1;          /* is this the first alternative? */
 

diff --git a/winsup/cygwin/regex/regerror.c b/winsup/cygwin/regex/regerror.c
index 7e88be5cbcaea045b6715ce8525e26383a2058e8..1bba3e4a6f74b64f87f5215673bc08018fdf42c9 100644 (file)
--- a/winsup/cygwin/regex/regerror.c
+++ b/winsup/cygwin/regex/regerror.c
@@ -178,7 +178,7 @@ regatoi(const regex_t *preg, char *localbuf)
        if (r->code == 0)
 #ifdef __CYGWIN__ /* Avoid whining compiler */
            {
-               static const char null[] = "0";
+               static char null[] = "0";
                return null;
            }
 #else