Make getline.h and unicodeio.h self-contained.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 73d24e051394570187d62245405277cfbf57e437..0b9c9c1b229fe30243266dbad4d00cca572b4108 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-23  Bruno Haible  <bruno@clisp.org>
+
+       * getline.h: Include <stddef.h>, for size_t.
+
+       * unicodeio.h: Include <stddef.h>, for size_t.
+       * unicodeio.c: Don't include <stddef.h>.
+
 2002-12-17  Bruno Haible  <bruno@clisp.org>
 
        * canon-host.c (strdup): Remove unused declaration.

diff --git a/lib/getline.h b/lib/getline.h
index 991184c759ee366bb89fee476fdaa17bf631af5e..636e3dda663e9d0a3d77eac206fb4152b486ac02 100644 (file)
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 1995, 1997, 1999 Free Software Foundation, Inc.
+/*  Copyright (C) 1995, 1997, 1999, 2000-2002 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
@@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifndef GETLINE_H_
 # define GETLINE_H_ 1
 
+# include <stddef.h>
 # include <stdio.h>
 
 # ifndef PARAMS
@@ -27,12 +28,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #  endif
 # endif
 
+/* glibc2 has these functions declared in <stdio.h>.  Avoid redeclarations.  */
 # if __GLIBC__ < 2
+
 int
 getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
 
 int
 getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+
 # endif
 
 #endif /* not GETLINE_H_ */

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 2e7ffc9d0eedd1c7fdaefc1777d85dd3d64170ce..a698ca5df7d90209a3c44c7d0d698a9fc2a3e887 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -26,9 +26,8 @@
 # include <config.h>
 #endif
 
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
+/* Specification.  */
+#include "unicodeio.h"
 
 #include <stdio.h>
 #if HAVE_STRING_H
@@ -52,9 +51,6 @@ extern int errno;
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-/* Specification.  */
-#include "unicodeio.h"
-
 /* When we pass a Unicode character to iconv(), we must pass it in a
    suitable encoding. The standardized Unicode encodings are
    UTF-8, UCS-2, UCS-4, UTF-16, UTF-16BE, UTF-16LE, UTF-7.

diff --git a/lib/unicodeio.h b/lib/unicodeio.h
index fb2b75242539ad67e24ddc0aaa37e4e8c1a7e663..92fa23c335994283d77fb04e060b9d05b3209ae6 100644 (file)
--- a/lib/unicodeio.h
+++ b/lib/unicodeio.h
@@ -20,6 +20,7 @@
 #ifndef UNICODEIO_H
 # define UNICODEIO_H
 
+# include <stddef.h>
 # include <stdio.h>
 
 # ifndef PARAMS