* config/srclist.txt: Add glibc bug 1226.

* lib/regex_internal.c (calc_state_hash): Put 'inline' before type, since
some compilers warn about it otherwise.

diff --git a/config/ChangeLog b/config/ChangeLog
index 04ec036c9c58678d6e9f49d541ff4c9dfebfc47d..725cda7e6da6f3b0316ddc12053a5caf46755824 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,6 @@
 2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * srclist.txt: Add glibc bugs 1220, 1221, 1222, 1223, 1224, 1225.
+       * srclist.txt: Add glibc bugs 1220, 1221, 1222, 1223, 1224, 1225, 1226.
 
 2005-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/config/srclist.txt b/config/srclist.txt
index 62a228e15482e6953c3e15ca1e3a2489499eedcc..779ba1f6f1753a18178e7b181821e18b7e008bf0 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.76 2005-08-21 00:43:34 eggert Exp $
+# $Id: srclist.txt,v 1.77 2005-08-21 03:31:46 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -111,6 +111,7 @@ $LIBCSRC/posix/regex.c                      lib gpl
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1215
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1218
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1220
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=1226
 #$LIBCSRC/posix/regex_internal.c               lib gpl
 #
 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=1054

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 341580d21eea829edf9a8bc9ff2a12bb99b2cb4b..c50e56da00e241a7d5af790fe723a13263e1d6c2 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * regex_internal.c (calc_state_hash): Put 'inline' before type, since
+       some compilers warn about it otherwise.
+
 2005-08-20  Jim Meyering  <jim@meyering.net>
 
        * regexec.c (regexec, re_search_stub) [!_LIBC]: Omit declaration

diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index 80e84061363e63c867bfe616b386c4998ac23dbe..46fe046e48e8e4332551d94beee796883d9b99c5 100644 (file)
--- a/lib/regex_internal.c
+++ b/lib/regex_internal.c
@@ -34,7 +34,7 @@ static re_dfastate_t *create_cd_newstate (re_dfa_t *dfa,
                                          const re_node_set *nodes,
                                          unsigned int context,
                                          unsigned int hash) internal_function;
-static unsigned int inline calc_state_hash (const re_node_set *nodes,
+static inline unsigned int calc_state_hash (const re_node_set *nodes,
                                            unsigned int context) internal_function;
 \f
 /* Functions for string operation.  */
@@ -1353,7 +1353,7 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
   return dfa->nodes_len++;
 }
 
-static unsigned int inline
+static inline unsigned int
 internal_function
 calc_state_hash (const re_node_set *nodes, unsigned int context)
 {