[Commits] r16494 - in /trunk: ./ libc/ChangeLog libc/posix/regex_internal.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Jan  3 21:44:12 2012
New Revision: 16494

Log:
Merge changes between r16348 and r16431 from /fsf/trunk.

Modified:
    trunk/   (props changed)
    trunk/libc/ChangeLog
    trunk/libc/posix/regex_internal.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  3 21:44:12 2012
@@ -1,1 +1,1 @@
-/fsf/trunk:15224-16348
+/fsf/trunk:15224-16431

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Tue Jan  3 21:44:12 2012
@@ -1,3 +1,8 @@
+2011-12-30  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* posix/regex_internal.c (re_string_fetch_byte_case): Remove
+	pure attribute.
+
 2011-12-23  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* version.h (RELEASE): Bump for 2.15 release.

Modified: trunk/libc/posix/regex_internal.c
==============================================================================
--- trunk/libc/posix/regex_internal.c (original)
+++ trunk/libc/posix/regex_internal.c Tue Jan  3 21:44:12 2012
@@ -869,7 +869,7 @@
 }
 
 static unsigned char
-internal_function __attribute ((pure))
+internal_function
 re_string_fetch_byte_case (re_string_t *pstr)
 {
   if (BE (!pstr->mbs_allocated, 1))

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits