summaryrefslogtreecommitdiff
path: root/stdio-common/psignal.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-19 00:37:59 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-19 00:37:59 +0000
commit14c3586351fdf3e123b000f95a1e83314f78babb (patch)
treea88a6bfd8d809ab0b8e9ca70a2e63e932ddfa53d /stdio-common/psignal.c
parent439ff07be06e9354151f984c7d0d2fb05917e8be (diff)
Update.
2004-03-18 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Remove hwcap variable and weak_extern for _dl_hwcap. (_DL_HWCAP_TLS_MASK): Define. (HWCAP_CHECK): Fix checking of non-platform hwcap bits. Use lib->osversion instead of cache_new->libs[middle].osversion. * stdio-common/asprintf.c: Remove USE_IN_LIBIO conditionals. * stdio-common/dprintf.c: Likewise. * stdio-common/fprintf.c: Likewise. * stdio-common/getline.c: Likewise. * stdio-common/getw.c: Likewise. * stdio-common/perror.c: Likewise. * stdio-common/printf-prs.c: Likewise. * stdio-common/printf.c: Likewise. * stdio-common/printf_size.c: Likewise. * stdio-common/psignal.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/snprintf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/sscanf.c: Likewise. * stdio-common/tstgetln.c: Likewise. * stdio-common/vfprintf.c: Likewise. 2004-03-18 Paul Eggert <eggert@cs.ucla.edu> * posix/getopt.h (__GNUC_PREREQ) [!defined __THROW]: Define if not defined, fixing a typo (it used to be defined if __GNUC__ was not defined).
Diffstat (limited to 'stdio-common/psignal.c')
-rw-r--r--stdio-common/psignal.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/stdio-common/psignal.c b/stdio-common/psignal.c
index c756394e8c..0764af536b 100644
--- a/stdio-common/psignal.c
+++ b/stdio-common/psignal.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,1995-1997,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1996, 1997, 2001, 2002, 2004
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,9 +21,7 @@
#include <signal.h>
#include <stdlib.h>
#include <libintl.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
#ifndef HAVE_GNU_LD
@@ -49,11 +48,9 @@ psignal (int sig, const char *s)
if (sig >= 0 && sig < NSIG && (desc = INTUSE(_sys_siglist)[sig]) != NULL)
{
-#ifdef USE_IN_LIBIO
if (_IO_fwide (stderr, 0) > 0)
(void) __fwprintf (stderr, L"%s%s%s\n", s, colon, _(desc));
else
-#endif
(void) fprintf (stderr, "%s%s%s\n", s, colon, _(desc));
}
else
@@ -62,11 +59,9 @@ psignal (int sig, const char *s)
(void) __asprintf (&buf, _("%s%sUnknown signal %d\n"), s, colon, sig);
-#ifdef USE_IN_LIBIO
if (_IO_fwide (stderr, 0) > 0)
(void) __fwprintf (stderr, L"%s", buf);
else
-#endif
(void) fputs (buf, stderr);
free (buf);