olga / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone

Blame SOURCES/glibc-fedora-locarchive.patch

00db10
This is a part of commit glibc-2.3.3-1492-ga891c7b,
00db10
needed for fedora/build-locale-archive.c only.
00db10
00db10
diff -Nru glibc-2.17-c758a686/ChangeLog.17 glibc-2.17-c758a686/ChangeLog.17
00db10
--- glibc-2.17-c758a686/ChangeLog.17	2012-06-05 07:42:49.000000000 -0600
00db10
+++ glibc-2.17-c758a686/ChangeLog.17	2012-06-07 12:15:21.564319619 -0600
00db10
@@ -11818,6 +11829,10 @@ d2009-10-30  Ulrich Drepper  
00db10
 	[BZ #4368]
00db10
 	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
00db10
00db10
+2007-04-16  Jakub Jelinek  <jakub@redhat.com>
00db10
+
00db10
+	* locale/programs/locarchive.c (add_alias, insert_name): Remove static.
00db10
+
00db10
 2007-04-16  Ulrich Drepper  <drepper@redhat.com>
00db10
 
00db10
 	[BZ #4364]
00db10
diff -Nru glibc-2.17-c758a686/locale/programs/locarchive.c glibc-2.17-c758a686/locale/programs/locarchive.c
00db10
--- glibc-2.17-c758a686/locale/programs/locarchive.c	2012-06-05 07:42:49.000000000 -0600
00db10
+++ glibc-2.17-c758a686/locale/programs/locarchive.c	2012-06-07 12:15:21.585319540 -0600
00db10
@@ -252,9 +252,9 @@ oldlocrecentcmp (const void *a, const vo
00db10
 /* forward decls for below */
00db10
 static uint32_t add_locale (struct locarhandle *ah, const char *name,
00db10
 			    locale_data_t data, bool replace);
00db10
-static void add_alias (struct locarhandle *ah, const char *alias,
00db10
-		       bool replace, const char *oldname,
00db10
-		       uint32_t *locrec_offset_p);
00db10
+void add_alias (struct locarhandle *ah, const char *alias,
00db10
+		bool replace, const char *oldname,
00db10
+		uint32_t *locrec_offset_p);
00db10
 
00db10
 
00db10
 static bool
00db10
@@ -635,7 +635,7 @@ close_archive (struct locarhandle *ah)
00db10
 #include "../../intl/explodename.c"
00db10
 #include "../../intl/l10nflist.c"
00db10
 
00db10
-static struct namehashent *
00db10
+struct namehashent *
00db10
 insert_name (struct locarhandle *ah,
00db10
 	     const char *name, size_t name_len, bool replace)
00db10
 {
00db10
@@ -693,7 +693,7 @@ insert_name (struct locarhandle *ah,
00db10
   return &namehashtab[idx];
00db10
 }
00db10
 
00db10
-static void
00db10
+void
00db10
 add_alias (struct locarhandle *ah, const char *alias, bool replace,
00db10
 	   const char *oldname, uint32_t *locrec_offset_p)
00db10
 {