diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
| commit | 255acd161cc2d7752a4e79234dcba5d929c3e0a4 (patch) | |
| tree | 94c1d111cce2137ee948ff0e9d735f7a3643ef78 /locale | |
| parent | 593eff0f9e5bed517e0a8434507ee9f3f4d45b87 (diff) | |
| parent | a0e25a886a9128b280b4c05bc9c6dd12377ea868 (diff) | |
Merge commit 'origin/master' into fedora/master
Conflicts:
sysdeps/powerpc/powerpc64/____longjmp_chk.S
sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/locale.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/locale.h b/locale/locale.h index b24ae245fe..2aa19e76ac 100644 --- a/locale/locale.h +++ b/locale/locale.h @@ -130,7 +130,7 @@ extern struct lconv *localeconv (void) __THROW; __END_NAMESPACE_STD -#ifdef __USE_XOPEN2K +#ifdef __USE_XOPEN2K8 /* The concept of one static locale per category is not very well thought out. Many applications will need to process its data using information from several different locales. Another application is |