diff options
| author | Roland McGrath <roland@gnu.org> | 1995-05-20 00:13:43 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-05-20 00:13:43 +0000 |
| commit | a2fe9c76a9d7645c63288eda807e01a6b1901d29 (patch) | |
| tree | 68882cda9fe373eda0ecaa70503d34812186138d /locale | |
| parent | 2b83a2a4d978012cdf78b648337c31091e20526d (diff) | |
| download | glibc-a2fe9c76a9d7645c63288eda807e01a6b1901d29.tar.gz | |
Fri May 19 17:16:46 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/mach/hurd/i386/init-first.c: In cthreads case, handle
args on stack from kernel.
* posix/Makefile, sysdeps/alpha/Makefile,
* sysdeps/mach/hurd/Makefile, sysdeps/sparc/Makefile, Makefile,
* Makerules, Make-dist: Fix "cvs commit" cmds in rules to not fail
in the absence of CVS dirs.
* hurd/hurdstartup.c: Don't call __mach_init. Grok args from the
kernel on the stack properly.
* set-init.c: Never call _init/_fini; just run __libc_subinit.
* Makerules (LDFLAGS-c.so): Add -nostartfiles.
* mach/Machrules (LDFLAGS-$(interface.so)): Likewise.
* configure.in: Move defaulting of --with-elf and --with-gnu-*
based on host os outside the AC_CACHE_VAL for the sysdirs
calculation.
* Makeconfig (localedir, nlsdir): New variables.
* values.h: New file.
* Makefile (headers): Add values.h.
* locale/Makefile (distribute): Add error.h.
* locale/localedef.c: Include "error.h".
(main): Use error_message_count instead of warning_cntr.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/Makefile | 2 | ||||
| -rw-r--r-- | locale/localedef.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/locale/Makefile b/locale/Makefile index c3abc2c62e..74959e628a 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -25,7 +25,7 @@ headers = locale.h distribute = localeinfo.h categories.def \ $(localedef-modules:=.c) $(locale-modules:=.c) \ $(lib-modules:=.c) config.h hash.h iso-4217.def \ - keyword.gperf keyword.h localedef.h token.h + keyword.gperf keyword.h localedef.h token.h error.h routines = setlocale loadlocale localeconv nl_langinfo categories = ctype messages monetary numeric time collate aux = $(categories:%=lc-%) $(categories:%=C-%) diff --git a/locale/localedef.c b/locale/localedef.c index c331e11888..fceebc5635 100644 --- a/locale/localedef.c +++ b/locale/localedef.c @@ -24,6 +24,7 @@ Cambridge, MA 02139, USA. */ #include <string.h> #include <unistd.h> #include <sys/stat.h> +#include "error.h" #include "localedef.h" @@ -60,10 +61,6 @@ static const struct option long_options[] = }; -/* This is defined in error-msg.h. */ -extern int warning_cntr; - - /* Prototypes for local functions. */ static void usage (int status) __attribute__ ((noreturn)); static int construct_output_path (const char *path); @@ -169,7 +166,7 @@ main(int argc, char *argv[]) /* We are now able to write the data files. If warning were given we do it only if it is explicitly requested (--force). */ - if (warning_cntr == 0 || force_output != 0) + if (error_message_count == 0 || force_output != 0) if (cannot_write != 0) error (0, 0, gettext ("cannot write output file `%s': %s"), output_path, strerror (cannot_write)); |