forked from rpms/glibc
0e17ea22c1
The following commit removes the requirement for patches to be placed in 1000, 2000, or 3000 ID blocks depending on their upstream status. Instead upstream status is documented in the header of the patch with some semi-standard notation as described in template.patch. The patches are re-numbered and defined and applied in the same order. Verified that before and after the patch that the source tree does not change. The patch definition is resorted to match the patch application order.
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
Short description: Allow access to internal locale archive functions.
|
|
Author(s): Fedora glibc team <glibc@lists.fedoraproject.org>
|
|
Origin: PATCH
|
|
Upstream status: not-needed
|
|
|
|
This is a part of commit glibc-2.3.3-1492-ga891c7b,
|
|
needed for fedora/build-locale-archive.c only.
|
|
|
|
2007-04-16 Jakub Jelinek <jakub@redhat.com>
|
|
|
|
* locale/programs/locarchive.c (add_alias, insert_name): Remove static.
|
|
|
|
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)
|
|
{
|