diff options
| author | richard <richard@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-09-07 17:06:24 +0000 |
|---|---|---|
| committer | richard <richard@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-09-07 17:06:24 +0000 |
| commit | 49272c94417875e5255681b3eacee05ef0db27fb (patch) | |
| tree | 6fb76d929d6c8d76e1fe19c29a9f98a73c604f96 /libc/locale/programs/localedef.c | |
| parent | fb2c20d15ab8ca32b0c380b4968b07596bc09574 (diff) | |
* argp/argp-help.c (__argp_short_program_name): Protect function name
from macro expansion.
* argp/argp-namefrob.h: Don't include mempcpy.h, strcase.h,
strchrnul.h and strndup.h
* locale/programs/charmap-dir.c: Don't include spawn.h if
NO_COMPRESS is defined.
(fopen_uncompressed): Suppress if NO_COMPRESS is defined.
(charmap_open): Guard callers in the same way.
* locale/programs/ld-collate.c (new_element): Call wcslen_uint32
instead of wcslen.
(collate_finish, collate_output): Likewise wmemcmp_uint32/wmemcmp.
* locale/programs/ld-ctype.c (find_idx): Fix prototype.
(ctype_startup): Fix cast.
(ctype_output, read_translit_entry): Call wcslen_uint32 instead
of wcslen.
(ctype_read): Use BITw and BIT instead of _ISwdigit and _ISdigit.
(allocate_arrays): Call wcslen_uint32 instead of wcslen, wcscmp_uint32
instead of wcscmp, and wmemcpy_uint32 instead of wmemcpy.
* locale/programs/ld-time.c (time_finish): Initialize wt_fmt_ampm
and wdate_fmt with constant uint32_t arrays instead of wide character
strings. Call wcschr_uint32 instead of wcschr.
* locale/programs/linereader.c (get_string): Fix type of wide
character buffer.
* locale/programs/localedef.c (main): Don't call sysconf if
NO_SYSCONF is defined.
* locale/programs/locarchive.c (enlarge_archive): Avoid C99
constructs.
* locale/programs/locfile.c (add_locale_wstring): Call wcslen_uint32
instead of wcslen.
* locale/programs/locfile.h (wcslen_uint32, wmemcmp_uint32)
(wcscmp_uint32, wmemcpy_uint32, wcschr_uint32): New functions.
git-svn-id: svn://svn.eglibc.org/trunk@165 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale/programs/localedef.c')
| -rw-r--r-- | libc/locale/programs/localedef.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/locale/programs/localedef.c b/libc/locale/programs/localedef.c index 50cb179fa..82ec2e398 100644 --- a/libc/locale/programs/localedef.c +++ b/libc/locale/programs/localedef.c @@ -240,12 +240,14 @@ main (int argc, char *argv[]) ctype locale. (P1003.2 4.35.5.2) */ setlocale (LC_CTYPE, "POSIX"); +#ifndef NO_SYSCONF /* Look whether the system really allows locale definitions. POSIX defines error code 3 for this situation so I think it must be a fatal error (see P1003.2 4.35.8). */ if (sysconf (_SC_2_LOCALEDEF) < 0) WITH_CUR_LOCALE (error (3, 0, _("\ FATAL: system does not define `_POSIX2_LOCALEDEF'"))); +#endif /* Process charmap file. */ charmap = charmap_read (charmap_file, verbose, 1, be_quiet, 1); |