X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetline.h;h=636e3dda663e9d0a3d77eac206fb4152b486ac02;hb=609f9cb77296a39e8776d420091a66f2ea5acb72;hp=f0bdf0f82d3f1090c848731ded500fc1f22926a9;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git

diff --git a/lib/getline.h b/lib/getline.h
index f0bdf0f82..636e3dda6 100644
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 1995 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
@@ -14,18 +14,22 @@ 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.  */
 
-#ifndef _getline_h_
-# define _getline_h_ 1
+#ifndef GETLINE_H_
+# define GETLINE_H_ 1
 
+# include <stddef.h>
 # include <stdio.h>
 
 # ifndef PARAMS
-#  if defined (__GNUC__) || __STDC__
-#   define PARAMS(args) args
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
 #  else
-#   define PARAMS(args) ()
-#  endif  /* GCC.  */
-# endif  /* Not PARAMS.  */
+#   define PARAMS(Args) ()
+#  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));
@@ -33,4 +37,6 @@ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
 int
 getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
 
-#endif
+# endif
+
+#endif /* not GETLINE_H_ */