X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fquotearg.c;h=f7f326ac5017475d76046d39962aa0b48f3ad09e;hb=5d0b385594bc914e6233988bfb6bc1b92a2184b5;hp=0ad8da893ce42547c085975ca32782d455d6c825;hpb=44fa0d78ad36205f393cd4aa4813d1e7a403d6dc;p=gnulib.git

diff --git a/lib/quotearg.c b/lib/quotearg.c
index 0ad8da893..f7f326ac5 100644
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -1,6 +1,6 @@
 /* quotearg.c - quote arguments for output
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -31,20 +31,13 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
+#include <wctype.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-#if HAVE_WCHAR_H
-
-/* BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared.  */
-# include <stdio.h>
-# include <time.h>
-
-# include <wchar.h>
-#endif
-
 #if !HAVE_MBRTOWC
 /* Disable multibyte processing entirely.  Since MB_CUR_MAX is 1, the
    other macros are defined only for documentation and to satisfy C
@@ -62,8 +55,6 @@
 # define mbsinit(ps) 1
 #endif
 
-#include <wctype.h>
-
 #ifndef SIZE_MAX
 # define SIZE_MAX ((size_t) -1)
 #endif