From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 21 Aug 2005 03:31:45 +0000 (+0000)
Subject: * config/srclist.txt: Add glibc bug 1226.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c0a244e6628467378462a623e8531beaab0b85c;p=pspp

* 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 04ec036c9c..725cda7e6d 100644
--- 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 62a228e154..779ba1f6f1 100644
--- 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 341580d21e..c50e56da00 100644
--- 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 80e8406136..46fe046e48 100644
--- 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;
 
 /* 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)
 {