summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-02-01 12:22:55 +0100
committerAndreas Schwab <schwab@redhat.com>2010-02-01 12:22:55 +0100
commit5229ffc381ccf5897ca83be5891051c7607638f6 (patch)
tree0acfe4328875230186f82ff09a1e07e1df9373d0 /locale
parentb675f5a8621ca898e64d0bf51d7fa1469322f861 (diff)
parentb34e12e22c00d74ee549ae9ac304f64d1d6374d5 (diff)
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'locale')
-rw-r--r--locale/loadlocale.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 6ef25b0234..61e6f7f0a6 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -224,6 +224,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
PROT_READ, MAP_FILE|MAP_COPY, fd, 0);
if (__builtin_expect (filedata == MAP_FAILED, 0))
{
+ filedata = NULL;
if (__builtin_expect (errno, ENOSYS) == ENOSYS)
{
#endif /* _POSIX_MAPPED_FILES */