diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-12-04 01:41:39 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-04 01:41:39 +0000 |
| commit | 4770745624b7f7f25623f1f10d46a4c4d6aec25c (patch) | |
| tree | 0b278b62f5486313ca69360800755575487fb0f8 /intl/l10nflist.c | |
| parent | d88554f033adab5d22b9860fc36bc3cb37f39b02 (diff) | |
| download | glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar.gz glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.tar.bz2 glibc-4770745624b7f7f25623f1f10d46a4c4d6aec25c.zip | |
update from main archive 961203
Tue Dec 3 08:38:15 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/unix/alpha/sysdep.S: Remove definition of __errno_location.
Reformat copyright.
* elf/rtld.c (_dl_start): Don't dereference the value returned by
elf_machine_got to get _DYNAMIC, instead call new function
elf_machine_dynamic.
* sysdeps/alpha/dl-machine.h: Permute elf_machine_got to
elf_machine_dynamic. Reformat copyright.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/mips/dl-machine.h: Likewise.
* sysdeps/sparc/dl-machine.h: Likewise.
* sysdeps/stub/dl-machine.h: Likewise.
Tue Oct 15 23:46:00 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* MakeTAGS (sysdep_dirs): Include add-on sysdep directories.
Tue Dec 3 02:06:18 1996 Ulrich Drepper <drepper@cygnus.com>
* Makerules ($(libdir)/libc.so): Make first line of generated
link script contain `/* GNU ld script'. This will be used in
ldconfig to check for linker scripts.
* sysdeps/mach/hurd/libc-ldscript: Likewise.
* sysdeps/mach/hurd/libc_p-ldscript: Likewise.
* stdlib/getsubopt.c: Update copyright. Correct typo in comment.
Diffstat (limited to 'intl/l10nflist.c')
| -rw-r--r-- | intl/l10nflist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intl/l10nflist.c b/intl/l10nflist.c index 9a586ec521..b50eff465f 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -201,8 +201,8 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, + ((mask & XPG_NORM_CODESET) != 0 ? strlen (normalized_codeset) + 1 : 0) + (((mask & XPG_MODIFIER) != 0 - || (mask & CEN_AUDIENCE) != 0) ? - strlen (modifier) + 1 : 0) + || (mask & CEN_AUDIENCE) != 0) + ? strlen (modifier) + 1 : 0) + ((mask & CEN_SPECIAL) != 0 ? strlen (special) + 1 : 0) + ((mask & (CEN_SPONSOR | CEN_REVISION) != 0) |