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