summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-05-03 17:13:58 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-05-03 17:13:58 +0200
commit7a41ae89c66261eaaf61d9dd611b9fe9652bdef4 (patch)
tree89c83ca4c44dc6835e02aef0e27d5fc9aaf9d8fb
parenta60774e1582eba799b218a98052991e98fc86487 (diff)
downloadlocaledef-7a41ae89c66261eaaf61d9dd611b9fe9652bdef4.tar.gz
localedef-7a41ae89c66261eaaf61d9dd611b9fe9652bdef4.tar.xz
applied patchesv2.11.90-ptx1
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--Makefile.in1
-rw-r--r--eglibc/locale/programs/charmap-dir.c1
-rw-r--r--eglibc/locale/programs/locarchive.c3
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 617723e..e33f3a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,6 @@ localepath = "$(localedir):$(i18ndir)"
inst_localedir = $(install_root)$(localedir)
DEFINES = -DNO_SYSCONF \
- -DNO_UNCOMPRESS \
-DLOCALE_PATH='$(localepath)' \
-DLOCALEDIR='"$(localedir)"' \
-DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
diff --git a/eglibc/locale/programs/charmap-dir.c b/eglibc/locale/programs/charmap-dir.c
index 90c2599..542bfca 100644
--- a/eglibc/locale/programs/charmap-dir.c
+++ b/eglibc/locale/programs/charmap-dir.c
@@ -161,6 +161,7 @@ charmap_closedir (CHARMAP_DIR *cdir)
}
#ifndef NO_UNCOMPRESS
+extern char **environ;
/* Creates a subprocess decompressing the given pathname, and returns
a stream reading its output (the decompressed data). */
static
diff --git a/eglibc/locale/programs/locarchive.c b/eglibc/locale/programs/locarchive.c
index 27d589b..84b9ced 100644
--- a/eglibc/locale/programs/locarchive.c
+++ b/eglibc/locale/programs/locarchive.c
@@ -43,6 +43,7 @@
#include "../localeinfo.h"
#include "../locarchive.h"
#include "localedef.h"
+#include "locfile.h"
/* Define the hash function. We define the function as static inline.
We must change the name so as not to conflict with simple-hash.h. */
@@ -1112,7 +1113,7 @@ add_locale_to_archive (ah, name, data, replace)
} *filedata = data[LC_CTYPE].addr;
char *normalized_codeset_name = NULL;
codeset = (char *) filedata
- + filedata->strindex[_NL_ITEM_INDEX (_NL_CTYPE_CODESET_NAME)];
+ + maybe_swap_uint32(filedata->strindex[_NL_ITEM_INDEX (_NL_CTYPE_CODESET_NAME)]);
normalized_codeset = _nl_normalize_codeset (codeset, strlen (codeset));
mask |= XPG_NORM_CODESET;