* cycle-check.h (CYCLE_CHECK_REFLECT_CHDIR_UP): Abort if this

[gnulib.git] / lib / unicodeio.c

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 7b7f6f2..54cae55 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -1,6 +1,6 @@
 /* Unicode character output to streams with locale dependent encoding.
 
-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Bruno Haible <haible@clisp.cons.org>.  */
 
@@ -29,16 +29,8 @@
 #include "unicodeio.h"
 
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
+#include <string.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
 
 #if HAVE_ICONV
 # include <iconv.h>