[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-gnulib] getline.h and unicodeio.h self-contained
From: |
Bruno Haible |
Subject: |
[Bug-gnulib] getline.h and unicodeio.h self-contained |
Date: |
Tue, 31 Dec 2002 13:56:03 +0100 (CET) |
Hi,
I made this trivial change. It makes getline.h and unicodeio.h self-contained.
2002-12-23 Bruno Haible <address@hidden>
* getline.h: Include <stddef.h>, for size_t.
* unicodeio.h: Include <stddef.h>, for size_t.
* unicodeio.c: Don't include <stddef.h>.
diff -r -c3 gnulib-cvs/lib/getline.h gnulib/lib/getline.h
*** gnulib-cvs/lib/getline.h 2000-10-31 08:09:17.000000000 +0100
--- gnulib/lib/getline.h 2002-12-22 15:23:26.000000000 +0100
***************
*** 1,4 ****
! /* Copyright (C) 1995, 1997, 1999 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
--- 1,4 ----
! /* 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,22 ****
--- 17,23 ----
#ifndef GETLINE_H_
# define GETLINE_H_ 1
+ # include <stddef.h>
# include <stdio.h>
# ifndef PARAMS
***************
*** 27,38 ****
--- 28,42 ----
# 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 -r -c3 gnulib-cvs/lib/unicodeio.h gnulib/lib/unicodeio.h
*** gnulib-cvs/lib/unicodeio.h 2002-02-11 15:28:35.000000000 +0100
--- gnulib/lib/unicodeio.h 2002-12-23 01:58:34.000000000 +0100
***************
*** 20,25 ****
--- 20,26 ----
#ifndef UNICODEIO_H
# define UNICODEIO_H
+ # include <stddef.h>
# include <stdio.h>
# ifndef PARAMS
diff -r -c3 gnulib-cvs/lib/unicodeio.c gnulib/lib/unicodeio.c
*** gnulib-cvs/lib/unicodeio.c 2002-11-05 17:45:02.000000000 +0100
--- gnulib/lib/unicodeio.c 2002-12-23 01:59:28.000000000 +0100
***************
*** 26,34 ****
# include <config.h>
#endif
! #if HAVE_STDDEF_H
! # include <stddef.h>
! #endif
#include <stdio.h>
#if HAVE_STRING_H
--- 26,33 ----
# include <config.h>
#endif
! /* Specification. */
! #include "unicodeio.h"
#include <stdio.h>
#if HAVE_STRING_H
***************
*** 52,60 ****
#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
UCS-2 supports only characters up to \U0000FFFF.
--- 52,57 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Bug-gnulib] getline.h and unicodeio.h self-contained,
Bruno Haible <=