diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | locale/programs/ld-collate.c | 3 | ||||
| -rw-r--r-- | manual/message.texi | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index c4c20927ac..56c2112a83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2000-03-14 Ulrich Drepper <drepper@redhat.com> + * locale/programs/ld-collate.c (collate_read): Fix warning. + * sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Prepend REG_ to enum values and macros for register names. diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index 1943f6250f..dbe822b4ac 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -3392,7 +3392,8 @@ error while adding equivalent collating symbol")); { lr_error (ldfile, _("%s: order for `%.*s' already defined at %s:%zu"), - "LC_COLLATE", 9, "UNDEFINED", collate->undefined.file, + "LC_COLLATE", 9, "UNDEFINED", + (int) collate->undefined.file, collate->undefined.line); lr_ignore_rest (ldfile, 0); } diff --git a/manual/message.texi b/manual/message.texi index 47061295df..446e6d7b56 100644 --- a/manual/message.texi +++ b/manual/message.texi @@ -1346,7 +1346,7 @@ Polish The header entry would look like this: @smallexample -nplurals=4; plural=n==1 ? 0 : n%10==2 ? 1 : n==3 || n+=4 ? 2 : 3 +nplurals=4; plural=n==1 ? 0 : n%10==2 ? 1 : n%10==3 || n%10==4 ? 2 : 3 @end smallexample @noindent |