aboutsummaryrefslogtreecommitdiff
path: root/misc/err.c
diff options
context:
space:
mode:
Diffstat (limited to 'misc/err.c')
-rw-r--r--misc/err.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/misc/err.c b/misc/err.c
index 716f994..2a15bac 100644
--- a/misc/err.c
+++ b/misc/err.c
@@ -1,5 +1,5 @@
/* 4.4BSD utility functions for error messages.
- Copyright (C) 1995,96,98,2001,02 Free Software Foundation, Inc.
+ Copyright (C) 1995,1996,1998,2001,2002,2011 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
@@ -24,11 +24,9 @@
#include <string.h>
#include <stdio.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-# define flockfile(s) _IO_flockfile (s)
-# define funlockfile(s) _IO_funlockfile (s)
-#endif
+#include <wchar.h>
+#define flockfile(s) _IO_flockfile (s)
+#define funlockfile(s) _IO_funlockfile (s)
extern char *__progname;
@@ -40,11 +38,10 @@ extern char *__progname;
va_end (ap); \
}
-#ifdef USE_IN_LIBIO
static void
convert_and_print (const char *format, __gnuc_va_list ap)
{
-# define ALLOCA_LIMIT 2000
+#define ALLOCA_LIMIT 2000
size_t len;
wchar_t *wformat = NULL;
mbstate_t st;
@@ -85,13 +82,11 @@ convert_and_print (const char *format, __gnuc_va_list ap)
__vfwprintf (stderr, wformat, ap);
}
-#endif
void
vwarnx (const char *format, __gnuc_va_list ap)
{
flockfile (stderr);
-#ifdef USE_IN_LIBIO
if (_IO_fwide (stderr, 0) > 0)
{
__fwprintf (stderr, L"%s: ", __progname);
@@ -99,7 +94,6 @@ vwarnx (const char *format, __gnuc_va_list ap)
putwc_unlocked (L'\n', stderr);
}
else
-#endif
{
fprintf (stderr, "%s: ", __progname);
if (format)
@@ -116,7 +110,6 @@ vwarn (const char *format, __gnuc_va_list ap)
int error = errno;
flockfile (stderr);
-#ifdef USE_IN_LIBIO
if (_IO_fwide (stderr, 0) > 0)
{
__fwprintf (stderr, L"%s: ", __progname);
@@ -129,7 +122,6 @@ vwarn (const char *format, __gnuc_va_list ap)
__fwprintf (stderr, L"%m\n");
}
else
-#endif
{
fprintf (stderr, "%s: ", __progname);
if (format)