diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-02-19 18:52:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-02-19 18:52:30 +0000 |
| commit | 03e4219e7783eaa6d5cf1b02a79e00b857185e55 (patch) | |
| tree | 31f9bb78971ab4f1657fbbd78ced4cd1b6e2a509 /iconv/iconv_prog.c | |
| parent | fb5663ca863c5b970cdb521aa4570ef9f649745b (diff) | |
| download | glibc-03e4219e7783eaa6d5cf1b02a79e00b857185e55.tar.gz glibc-03e4219e7783eaa6d5cf1b02a79e00b857185e55.tar.xz glibc-03e4219e7783eaa6d5cf1b02a79e00b857185e55.zip | |
Update.
1998-02-19 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sigqueue.c: Fix weak alias definition. 1998-02-19 17:16 Ulrich Drepper <drepper@cygnus.com> * libc.map: More reordering for GLIBC_2.1 symbols. 1998-02-19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Move some functions from version GLIBC_2.0 to GLIBC_2.1, reorder declarations. 1998-02-19 Ulrich Drepper <drepper@cygnus.com> * resolv/gethnamaddr.c (addrsort): Make this function extern. Patch by zab@thebrain.grumblesmurf.net. 1998-02-19 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/libnsl.map: NIS+ support is new in glibc 2.1, add NIS+ functions with version GLIBC_2.1. 1998-02-19 14:05 Ulrich Drepper <drepper@cygnus.com> * libc.map: Add __sbrk, __setpgid, __getpgid for binary compatibility with 2.0 binaries. Reported by Thorsten Kukuk. 1998-02-19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * elf/dlvsym.c (dlvsym_doit): Correct last patch. * elf/dlsym.c (dlsym_doit): Likewise. 1998-02-19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * elf/link.h: Correct typos. * iconv/iconv_prog.c: Correct typo. * elf/dl-open.c (_dl_open): Assign correct value to new->l_global.
Diffstat (limited to 'iconv/iconv_prog.c')
| -rw-r--r-- | iconv/iconv_prog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index a8ede5069e..c5910a5585 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -111,7 +111,7 @@ main (int argc, char *argv[]) since we do not know what to do. */ if (from_code == NULL && to_code == NULL) error (EXIT_FAILURE, 0, - _("neither original not target encoding specified")); + _("neither original nor target encoding specified")); if (from_code == NULL) error (EXIT_FAILURE, 0, _("original encoding not specified using `-f'")); if (to_code == NULL) |