[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-gnulib] strnlen patch to assume C89 or better
|
From: |
Paul Eggert |
|
Subject: |
Re: [Bug-gnulib] strnlen patch to assume C89 or better |
|
Date: |
11 Sep 2003 02:08:44 -0700 |
|
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 |
I installed that patch (which was identical to one I already prepared).
I have the following C89 patches prepared, too. I'll install and/or
generate more email about them tomorrow as it's getting a bit late for
me to install them today.
Index: lib/argmatch.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/argmatch.c,v
retrieving revision 1.30
diff -p -u -r1.30 argmatch.c
--- lib/argmatch.c 10 Mar 2003 07:31:50 -0000 1.30
+++ lib/argmatch.c 11 Sep 2003 08:59:28 -0000
@@ -212,7 +212,6 @@ argmatch_to_argument (const char *value,
* Based on "getversion.c" by David MacKenzie <address@hidden>
*/
char *program_name;
-extern const char *getenv ();
/* When to make backup files. */
enum backup_type
Index: lib/localcharset.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/localcharset.c,v
retrieving revision 1.15
diff -p -u -r1.15 localcharset.c
--- lib/localcharset.c 14 Jul 2003 22:44:04 -0000 1.15
+++ lib/localcharset.c 11 Sep 2003 08:59:29 -0000
@@ -25,19 +25,10 @@
/* Specification. */
#include "localcharset.h"
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
+#include <stddef.h>
#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
#if defined _WIN32 || defined __WIN32__
# undef WIN32 /* avoid warning on mingw32 */
@@ -96,9 +87,6 @@
'charset_aliases' simultaneously, both will produce the same value,
and everything will be ok if the two assignments to 'charset_aliases'
are atomic. But I don't know what will happen if the two assignments mix.
*/
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
/* Pointer to the contents of the charset.alias file, if it has already been
read, else NULL. Its format is:
ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
@@ -106,7 +94,7 @@ static const char * volatile charset_ali
/* Return a pointer to the contents of the charset.alias file. */
static const char *
-get_charset_aliases ()
+get_charset_aliases (void)
{
const char *cp;
@@ -267,7 +255,7 @@ get_charset_aliases ()
STATIC
#endif
const char *
-locale_charset ()
+locale_charset (void)
{
const char *codeset;
const char *aliases;
Index: lib/progreloc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/progreloc.c,v
retrieving revision 1.1
diff -p -u -r1.1 progreloc.c
--- lib/progreloc.c 20 Aug 2003 19:45:05 -0000 1.1
+++ lib/progreloc.c 11 Sep 2003 08:59:29 -0000
@@ -285,7 +285,7 @@ set_program_name_and_installdir (const c
/* Return the full pathname of the current executable, based on the earlier
call to set_program_name_and_installdir. Return NULL if unknown. */
char *
-get_full_program_name ()
+get_full_program_name (void)
{
return executable_fullname;
}
Index: lib/setenv.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/setenv.c,v
retrieving revision 1.8
diff -p -u -r1.8 setenv.c
--- lib/setenv.c 10 Sep 2003 14:16:32 -0000 1.8
+++ lib/setenv.c 11 Sep 2003 08:59:29 -0000
@@ -280,7 +280,7 @@ setenv (const char *name, const char *va
never made it. Nevertheless the POSIX.9 standard (POSIX bindings
for Fortran 77) requires this function. */
int
-clearenv ()
+clearenv (void)
{
LOCK;
Index: lib/stpncpy.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/stpncpy.c,v
retrieving revision 1.1
diff -p -u -r1.1 stpncpy.c
--- lib/stpncpy.c 29 Jan 2003 16:47:25 -0000 1.1
+++ lib/stpncpy.c 11 Sep 2003 08:59:29 -0000
@@ -27,12 +27,6 @@
/* Specification. */
#include "stpncpy.h"
-#ifdef _LIBC
-# include <string.h>
-#else
-# include <sys/types.h>
-#endif
-
#ifndef weak_alias
# define __stpncpy stpncpy
#endif
Index: lib/strdup.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strdup.c,v
retrieving revision 1.12
diff -p -u -r1.12 strdup.c
--- lib/strdup.c 17 Aug 2003 05:30:20 -0000 1.12
+++ lib/strdup.c 11 Sep 2003 08:59:29 -0000
@@ -1,4 +1,6 @@
-/* Copyright (C) 1991, 1996, 1997, 1998, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003 Free Software
+ Foundation, Inc.
+
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
@@ -19,13 +21,8 @@
#include <config.h>
#endif
-#if defined _LIBC || defined STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *malloc ();
-char *memcpy ();
-#endif
+#include <stdlib.h>
+#include <string.h>
#undef __strdup
#undef strdup
Index: lib/strftime.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strftime.c,v
retrieving revision 1.72
diff -p -u -r1.72 strftime.c
--- lib/strftime.c 6 Sep 2003 21:34:07 -0000 1.72
+++ lib/strftime.c 11 Sep 2003 08:59:30 -0000
@@ -22,7 +22,6 @@
#endif
#ifdef _LIBC
-# define HAVE_LIMITS_H 1
# define HAVE_MBLEN 1
# define HAVE_MBRLEN 1
# define HAVE_STRUCT_ERA_ENTRY 1
@@ -31,14 +30,9 @@
# define HAVE_TZNAME 1
# define HAVE_TZSET 1
# define MULTIBYTE_IS_FORMAT_SAFE 1
-# define STDC_HEADERS 1
# include "../locale/localeinfo.h"
#endif
-#if defined emacs && !defined HAVE_BCOPY
-# define HAVE_MEMCPY 1
-#endif
-
#include <ctype.h>
#include <sys/types.h> /* Some systems define `time_t' here. */
@@ -76,19 +70,10 @@ extern char *tzname[];
static const mbstate_t mbstate_zero;
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#if STDC_HEADERS
-# include <stddef.h>
-# include <stdlib.h>
-# include <string.h>
-#else
-# ifndef HAVE_MEMCPY
-# define memcpy(d, s, n) bcopy ((s), (d), (n))
-# endif
-#endif
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
#ifdef COMPILE_WIDE
# include <endian.h>
@@ -106,11 +91,7 @@ extern char *tzname[];
# define L_(Str) Str
# define NLW(Sym) Sym
-# if !defined STDC_HEADERS && !defined HAVE_MEMCPY
-# define MEMCPY(d, s, n) bcopy ((s), (d), (n))
-# else
-# define MEMCPY(d, s, n) memcpy ((d), (s), (n))
-# endif
+# define MEMCPY(d, s, n) memcpy (d, s, n)
# define STRLEN(s) strlen (s)
# ifdef _LIBC
@@ -122,30 +103,6 @@ extern char *tzname[];
# endif
#endif
-#ifndef __P
-# if defined __GNUC__ || (defined __STDC__ && __STDC__)
-# define __P(args) args
-# else
-# define __P(args) ()
-# endif /* GCC. */
-#endif /* Not __P. */
-
-#ifndef PTR
-# ifdef __STDC__
-# define PTR void *
-# else
-# define PTR char *
-# endif
-#endif
-
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-
-#ifndef NULL
-# define NULL 0
-#endif
-
#define TYPE_SIGNED(t) ((t) -1 < 0)
/* Bound on length of the string representing an integer value of type t.
@@ -184,55 +141,12 @@ extern char *tzname[];
#endif
-#if !defined memset && !defined HAVE_MEMSET && !defined _LIBC
-/* Some systems lack the `memset' function and we don't want to
- introduce additional dependencies. */
-/* The SGI compiler reportedly barfs on the trailing null
- if we use a string constant as the initializer. 28 June 1997, rms. */
-static const CHAR_T spaces[16] = /* " " */
-{
- L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),
- L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' '),L_(' ')
-};
-static const CHAR_T zeroes[16] = /* "0000000000000000" */
-{
- L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),
- L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0'),L_('0')
-};
-
-# define memset_space(P, Len) \
- do { \
- int _len = (Len); \
- \
- do \
- {
\
- int _this = _len > 16 ? 16 : _len; \
- (P) = MEMPCPY ((P), spaces, _this * sizeof (CHAR_T)); \
- _len -= _this; \
- }
\
- while (_len > 0); \
- } while (0)
-
-# define memset_zero(P, Len) \
- do { \
- int _len = (Len); \
- \
- do \
- {
\
- int _this = _len > 16 ? 16 : _len; \
- (P) = MEMPCPY ((P), zeroes, _this * sizeof (CHAR_T)); \
- _len -= _this; \
- }
\
- while (_len > 0); \
- } while (0)
+#ifdef COMPILE_WIDE
+# define memset_space(P, Len) (wmemset (P, L' ', Len), (P) += (Len))
+# define memset_zero(P, Len) (wmemset (P, L'0', Len), (P) += (Len))
#else
-# ifdef COMPILE_WIDE
-# define memset_space(P, Len) (wmemset ((P), L' ', (Len)), (P) += (Len))
-# define memset_zero(P, Len) (wmemset ((P), L'0', (Len)), (P) += (Len))
-# else
-# define memset_space(P, Len) (memset ((P), ' ', (Len)), (P) += (Len))
-# define memset_zero(P, Len) (memset ((P), '0', (Len)), (P) += (Len))
-# endif
+# define memset_space(P, Len) (memset (P, ' ', Len), (P) += (Len))
+# define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len))
#endif
#define add(n, f) \
@@ -265,7 +179,7 @@ static const CHAR_T zeroes[16] = /* "000
else if (to_uppcase) \
memcpy_uppcase (p, (s), _n LOCALE_ARG); \
else \
- MEMCPY ((PTR) p, (const PTR) (s), _n))
+ MEMCPY ((void *) p, (void const *) (s), _n))
#ifdef COMPILE_WIDE
# ifndef USE_IN_EXTENDED_LOCALE_MODEL
@@ -294,16 +208,12 @@ static const CHAR_T zeroes[16] = /* "000
# undef _NL_CURRENT
# define _NL_CURRENT(category, item) \
(current->values[_NL_ITEM_INDEX (item)].string)
-# define LOCALE_PARAM , loc
# define LOCALE_ARG , loc
-# define LOCALE_PARAM_DECL __locale_t loc;
# define LOCALE_PARAM_PROTO , __locale_t loc
# define HELPER_LOCALE_ARG , current
#else
-# define LOCALE_PARAM
# define LOCALE_PARAM_PROTO
# define LOCALE_ARG
-# define LOCALE_PARAM_DECL
# ifdef _LIBC
# define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME)
# else
@@ -339,30 +249,18 @@ static const CHAR_T zeroes[16] = /* "000
more reliable way to accept other sets of digits. */
#define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9)
-static CHAR_T *memcpy_lowcase __P ((CHAR_T *dest, const CHAR_T *src,
- size_t len LOCALE_PARAM_PROTO));
-
static CHAR_T *
-memcpy_lowcase (dest, src, len LOCALE_PARAM)
- CHAR_T *dest;
- const CHAR_T *src;
- size_t len;
- LOCALE_PARAM_DECL
+memcpy_lowcase (CHAR_T *dest, const CHAR_T *src,
+ size_t len LOCALE_PARAM_PROTO)
{
while (len-- > 0)
dest[len] = TOLOWER ((UCHAR_T) src[len], loc);
return dest;
}
-static CHAR_T *memcpy_uppcase __P ((CHAR_T *dest, const CHAR_T *src,
- size_t len LOCALE_PARAM_PROTO));
-
static CHAR_T *
-memcpy_uppcase (dest, src, len LOCALE_PARAM)
- CHAR_T *dest;
- const CHAR_T *src;
- size_t len;
- LOCALE_PARAM_DECL
+memcpy_uppcase (CHAR_T *dest, const CHAR_T *src,
+ size_t len LOCALE_PARAM_PROTO)
{
while (len-- > 0)
dest[len] = TOUPPER ((UCHAR_T) src[len], loc);
@@ -374,11 +272,8 @@ memcpy_uppcase (dest, src, len LOCALE_PA
/* Yield the difference between *A and *B,
measured in seconds, ignoring leap seconds. */
# define tm_diff ftime_tm_diff
-static int tm_diff __P ((const struct tm *, const struct tm *));
static int
-tm_diff (a, b)
- const struct tm *a;
- const struct tm *b;
+tm_diff (const struct tm *, const struct tm *)
{
/* Compute intervening leap days correctly even if year is negative.
Take care to avoid int overflow in leap day calculations,
@@ -408,14 +303,11 @@ tm_diff (a, b)
#define ISO_WEEK_START_WDAY 1 /* Monday */
#define ISO_WEEK1_WDAY 4 /* Thursday */
#define YDAY_MINIMUM (-366)
-static int iso_week_days __P ((int, int));
#ifdef __GNUC__
__inline__
#endif
static int
-iso_week_days (yday, wday)
- int yday;
- int wday;
+iso_week_days (int yday, int wday)
{
/* Add enough to the first operand of % to make it nonnegative. */
int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
@@ -451,7 +343,6 @@ static CHAR_T const month_name[][10] =
#ifdef my_strftime
# define extra_args , ut, ns
-# define extra_args_spec int ut; int ns;
# define extra_args_spec_iso , int ut, int ns
#else
# ifdef COMPILE_WIDE
@@ -462,7 +353,6 @@ static CHAR_T const month_name[][10] =
# define nl_get_alt_digit _nl_get_alt_digit
# endif
# define extra_args
-# define extra_args_spec
# define extra_args_spec_iso
/* We don't have this information in general. */
# define ut 0
@@ -484,13 +374,8 @@ static CHAR_T const month_name[][10] =
anywhere, so to determine how many characters would be
written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */
size_t
-my_strftime (s, maxsize, format, tp extra_args LOCALE_PARAM)
- CHAR_T *s;
- size_t maxsize;
- const CHAR_T *format;
- const struct tm *tp;
- extra_args_spec
- LOCALE_PARAM_DECL
+my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format,
+ const struct tm *tp extra_args_spec_iso LOCALE_PARAM_PROTO)
{
#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
struct locale_data *const current = loc->__locales[LC_TIME];
@@ -1437,12 +1322,8 @@ libc_hidden_def (my_strftime)
/* For Emacs we have a separate interface which corresponds to the normal
strftime function plus the ut argument, but without the ns argument. */
size_t
-emacs_strftimeu (s, maxsize, format, tp, ut)
- char *s;
- size_t maxsize;
- const char *format;
- const struct tm *tp;
- int ut;
+emacs_strftimeu (char *s, size_t maxsize, const char *format,
+ const struct tm *tp, int ut)
{
return my_strftime (s, maxsize, format, tp, ut, 0);
}
Index: lib/strtod.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strtod.c,v
retrieving revision 1.15
diff -p -u -r1.15 strtod.c
--- lib/strtod.c 7 Aug 2000 15:48:18 -0000 1.15
+++ lib/strtod.c 11 Sep 2003 08:59:30 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1997, 1999, 2003 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
@@ -37,22 +37,9 @@ extern int errno;
#include <math.h>
-#if HAVE_FLOAT_H
-# include <float.h>
-#else
-# define DBL_MAX 1.7976931348623159e+308
-# define DBL_MIN 2.2250738585072010e-308
-#endif
-
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-# define NULL 0
-# ifndef HUGE_VAL
-# define HUGE_VAL HUGE
-# endif
-#endif
+#include <float.h>
+#include <stdlib.h>
+#include <string.h>
/* Convert NPTR to a double. If ENDPTR is not NULL, a pointer to the
character after the last one used in the number is put in *ENDPTR. */
Index: lib/strtoimax.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strtoimax.c,v
retrieving revision 1.8
diff -p -u -r1.8 strtoimax.c
--- lib/strtoimax.c 16 Aug 2003 06:19:01 -0000 1.8
+++ lib/strtoimax.c 11 Sep 2003 08:59:30 -0000
@@ -27,20 +27,12 @@
# include <stdint.h>
#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
/* Verify a requirement at compile-time (unlike assert, which is runtime). */
#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
#ifdef UNSIGNED
-# ifndef HAVE_DECL_STRTOUL
-"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOUL
-unsigned long strtoul (char const *, char **, int);
-# endif
# ifndef HAVE_DECL_STRTOULL
"this configure-time declaration test was not run"
# endif
@@ -50,12 +42,6 @@ unsigned long long strtoull (char const
#else
-# ifndef HAVE_DECL_STRTOL
-"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOL
-long strtol (char const *, char **, int);
-# endif
# ifndef HAVE_DECL_STRTOLL
"this configure-time declaration test was not run"
# endif
Index: lib/strtol.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/strtol.c,v
retrieving revision 1.16
diff -p -u -r1.16 strtol.c
--- lib/strtol.c 7 Aug 2000 15:48:18 -0000 1.16
+++ lib/strtol.c 11 Sep 2003 08:59:30 -0000
@@ -1,5 +1,8 @@
/* Convert string representation of a number into an integer value.
- Copyright (C) 1991, 92, 94, 95, 96, 97, 98, 99 Free Software Foundation,
Inc.
+
+ Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003
+ Free Software Foundation, Inc.
+
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to address@hidden
@@ -23,8 +26,6 @@
#ifdef _LIBC
# define USE_NUMBER_GROUPING
-# define STDC_HEADERS
-# define HAVE_LIMITS_H
#endif
#include <ctype.h>
@@ -36,19 +37,10 @@ extern int errno;
# define __set_errno(Val) errno = (Val)
#endif
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stddef.h>
-# include <stdlib.h>
-# include <string.h>
-#else
-# ifndef NULL
-# define NULL 0
-# endif
-#endif
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
#ifdef USE_NUMBER_GROUPING
# include "../locale/localeinfo.h"
@@ -164,13 +156,6 @@ extern int errno;
# endif
#else
# define LONG long
-
-# ifndef ULONG_MAX
-# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
-# endif
-# ifndef LONG_MAX
-# define LONG_MAX ((long int) (ULONG_MAX >> 1))
-# endif
# define STRTOL_LONG_MIN LONG_MIN
# define STRTOL_LONG_MAX LONG_MAX
# define STRTOL_ULONG_MAX ULONG_MAX
@@ -186,7 +171,7 @@ extern int errno;
# define _NL_CURRENT(category, item) \
(current->values[_NL_ITEM_INDEX (item)].string)
# define LOCALE_PARAM , loc
-# define LOCALE_PARAM_DECL __locale_t loc;
+# define LOCALE_PARAM_DECL , __locale_t loc
#else
# define LOCALE_PARAM
# define LOCALE_PARAM_DECL
@@ -230,15 +215,9 @@ extern int errno;
# endif
#endif
-/* For compilers which are ansi but don't define __STDC__, like SGI
- Irix-4.0.5 cc, also check whether PROTOTYPES is defined. */
-#if defined (__STDC__) || defined (PROTOTYPES)
-# define INTERNAL(X) INTERNAL1(X)
-# define INTERNAL1(X) __##X##_internal
-# define WEAKNAME(X) WEAKNAME1(X)
-#else
-# define INTERNAL(X) __/**/X/**/_internal
-#endif
+#define INTERNAL(X) INTERNAL1(X)
+#define INTERNAL1(X) __##X##_internal
+#define WEAKNAME(X) WEAKNAME1(X)
#ifdef USE_NUMBER_GROUPING
/* This file defines a function to check for correct grouping. */
@@ -255,12 +234,8 @@ extern int errno;
one converted is stored in *ENDPTR. */
INT
-INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
- const STRING_TYPE *nptr;
- STRING_TYPE **endptr;
- int base;
- int group;
- LOCALE_PARAM_DECL
+INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
+ int base, int group LOCALE_PARAM_DECL)
{
int negative;
register unsigned LONG int cutoff;
@@ -445,28 +420,13 @@ noconv:
/* External user entry point. */
-#if _LIBC - 0 == 0
-# undef PARAMS
-# if defined (__STDC__) && __STDC__
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-
-/* Prototype. */
-INT strtol PARAMS ((const STRING_TYPE *nptr, STRING_TYPE **endptr, int base));
-#endif
-
INT
#ifdef weak_function
weak_function
#endif
-strtol (nptr, endptr, base LOCALE_PARAM)
- const STRING_TYPE *nptr;
- STRING_TYPE **endptr;
- int base;
- LOCALE_PARAM_DECL
+strtol (const STRING_TYPE *nptr, STRING_TYPE **endptr,
+ int base LOCALE_PARAM_DECL)
{
return INTERNAL (strtol) (nptr, endptr, base, 0 LOCALE_PARAM);
}
Index: lib/tempname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/tempname.c,v
retrieving revision 1.10
diff -p -u -r1.10 tempname.c
--- lib/tempname.c 29 May 2003 07:21:59 -0000 1.10
+++ lib/tempname.c 11 Sep 2003 08:59:31 -0000
@@ -44,12 +44,8 @@
#endif
#include <stddef.h>
-
-#if STDC_HEADERS || _LIBC
-# include <string.h>
-#endif
-
#include <stdlib.h>
+#include <string.h>
#if HAVE_FCNTL_H || _LIBC
# include <fcntl.h>
Index: lib/userspec.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/userspec.c,v
retrieving revision 1.37
diff -p -u -r1.37 userspec.c
--- lib/userspec.c 16 Aug 2003 06:25:29 -0000 1.37
+++ lib/userspec.c 11 Sep 2003 08:59:31 -0000
@@ -33,19 +33,8 @@
#endif
#include <limits.h>
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-# define strchr index
-# endif
-#endif
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
#if HAVE_UNISTD_H
# include <unistd.h>
Index: lib/xgethostname.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xgethostname.c,v
retrieving revision 1.14
diff -p -u -r1.14 xgethostname.c
--- lib/xgethostname.c 16 Aug 2003 06:58:50 -0000 1.14
+++ lib/xgethostname.c 11 Sep 2003 08:59:32 -0000
@@ -50,7 +50,7 @@ int gethostname ();
If malloc fails, exit.
Upon any other failure, return NULL. */
char *
-xgethostname ()
+xgethostname (void)
{
char *hostname;
size_t size;
Index: lib/xmalloc.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xmalloc.c,v
retrieving revision 1.25
diff -p -u -r1.25 xmalloc.c
--- lib/xmalloc.c 22 Jul 2003 22:10:56 -0000 1.25
+++ lib/xmalloc.c 11 Sep 2003 08:59:32 -0000
@@ -21,16 +21,9 @@
# include <config.h>
#endif
-#include <sys/types.h>
+#include "xalloc.h"
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-void *calloc ();
-void *malloc ();
-void *realloc ();
-void free ();
-#endif
+#include <stdlib.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -38,7 +31,6 @@ void free ();
#include "error.h"
#include "exitfail.h"
-#include "xalloc.h"
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
Index: lib/xstrtod.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xstrtod.c,v
retrieving revision 1.7
diff -p -u -r1.7 xstrtod.c
--- lib/xstrtod.c 6 Jan 2000 21:01:06 -0000 1.7
+++ lib/xstrtod.c 11 Sep 2003 08:59:32 -0000
@@ -1,5 +1,5 @@
/* xstrtod.c - error-checking interface to strtod
- Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1999, 2000, 2003 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
@@ -21,16 +21,12 @@
# include <config.h>
#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-double strtod ();
-#endif
+#include "xstrtod.h"
#include <errno.h>
-#include <stdio.h>
#include <limits.h>
-#include "xstrtod.h"
+#include <stdio.h>
+#include <stdlib.h>
/* Tell the compiler that non-default rounding modes are used. */
#if 199901 <= __STDC_VERSION__
@@ -43,10 +39,7 @@ double strtod ();
non-zero and don't modify *RESULT upon any failure. */
int
-xstrtod (str, ptr, result)
- const char *str;
- const char **ptr;
- double *result;
+xstrtod (char const *str, char const **ptr, double *result)
{
double val;
char *terminator;
Index: lib/xstrtol.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/xstrtol.c,v
retrieving revision 1.31
diff -p -u -r1.31 xstrtol.c
--- lib/xstrtol.c 29 May 2003 07:21:59 -0000 1.31
+++ lib/xstrtol.c 11 Sep 2003 08:59:32 -0000
@@ -33,21 +33,10 @@
need stderr defined if assertion checking is enabled. */
#include <stdio.h>
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-# define strchr index
-# endif
-#endif
-
#include <assert.h>
#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
#include <errno.h>
#ifndef errno
@@ -69,14 +58,6 @@ extern int errno;
#include "xstrtol.h"
-#if !HAVE_DECL_STRTOL && !defined strtol
-long int strtol ();
-#endif
-
-#if !HAVE_DECL_STRTOUL && !defined strtoul
-unsigned long int strtoul ();
-#endif
-
#if !HAVE_DECL_STRTOIMAX && !defined strtoimax
intmax_t strtoimax ();
#endif
@@ -266,7 +247,7 @@ __xstrtol (const char *s, char **ptr, in
char *program_name;
int
-main (int argc, char** argv)
+main (int argc, char **argv)
{
strtol_error s_err;
int i;
Index: m4/check-decl.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/check-decl.m4,v
retrieving revision 1.28
diff -p -u -r1.28 check-decl.m4
--- m4/check-decl.m4 12 Aug 2001 13:26:00 -0000 1.28
+++ m4/check-decl.m4 11 Sep 2003 08:59:32 -0000
@@ -1,4 +1,4 @@
-#serial 18
+#serial 19
dnl This is just a wrapper function to encapsulate this kludge.
dnl Putting it in a separate file like this helps share it between
@@ -9,19 +9,9 @@ AC_DEFUN([jm_CHECK_DECLS],
AC_REQUIRE([AC_HEADER_TIME])
headers='
#include <stdio.h>
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-# include <strings.h>
-# endif
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
+
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
Index: m4/closeout.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/closeout.m4,v
retrieving revision 1.1
diff -p -u -r1.1 closeout.m4
--- m4/closeout.m4 31 Dec 2002 13:42:06 -0000 1.1
+++ m4/closeout.m4 11 Sep 2003 08:59:32 -0000
@@ -1,5 +1,5 @@
-# closeout.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# closeout.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -9,5 +9,5 @@ dnl the same distribution terms as the r
AC_DEFUN([gl_CLOSEOUT],
[
dnl Prerequisites of lib/closeout.c.
- AC_CHECK_HEADERS_ONCE(stdlib.h)
+ :
])
Index: m4/gettimeofday.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/gettimeofday.m4,v
retrieving revision 1.7
diff -p -u -r1.7 gettimeofday.m4
--- m4/gettimeofday.m4 14 Aug 2003 21:59:28 -0000 1.7
+++ m4/gettimeofday.m4 11 Sep 2003 08:59:32 -0000
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
dnl From Jim Meyering.
dnl
@@ -12,14 +12,11 @@ dnl the wrapper functions that work arou
AC_DEFUN([AC_FUNC_GETTIMEOFDAY_CLOBBER],
[
AC_REQUIRE([AC_HEADER_TIME])
- AC_CHECK_HEADERS_ONCE(stdlib.h string.h)
AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer],
jm_cv_func_gettimeofday_clobber,
[AC_TRY_RUN([
#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
@@ -32,9 +29,7 @@ AC_DEFUN([AC_FUNC_GETTIMEOFDAY_CLOBBER],
# endif
#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
int
main ()
Index: m4/localcharset.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/localcharset.m4,v
retrieving revision 1.1
diff -p -u -r1.1 localcharset.m4
--- m4/localcharset.m4 31 Dec 2002 13:42:07 -0000 1.1
+++ m4/localcharset.m4 11 Sep 2003 08:59:32 -0000
@@ -1,5 +1,5 @@
-# localcharset.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# localcharset.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -9,7 +9,6 @@ dnl the same distribution terms as the r
AC_DEFUN([gl_LOCALCHARSET],
[
dnl Prerequisites of lib/localcharset.c.
- AC_CHECK_HEADERS_ONCE(stddef.h stdlib.h string.h)
AC_REQUIRE([AM_LANGINFO_CODESET])
AC_CHECK_FUNCS_ONCE(setlocale)
Index: m4/lstat.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/lstat.m4,v
retrieving revision 1.16
diff -p -u -r1.16 lstat.m4
--- m4/lstat.m4 23 Jul 2003 11:08:01 -0000 1.16
+++ m4/lstat.m4 11 Sep 2003 08:59:32 -0000
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
dnl From Jim Meyering.
dnl Determine whether lstat has the bug that it succeeds when given the
@@ -22,6 +22,5 @@ AC_DEFUN([jm_FUNC_LSTAT],
AC_DEFUN([gl_PREREQ_LSTAT],
[
AC_REQUIRE([AC_HEADER_STAT])
- AC_CHECK_HEADERS_ONCE(stdlib.h)
- AC_CHECK_DECLS_ONCE(free)
+ :
])
Index: m4/mbswidth.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mbswidth.m4,v
retrieving revision 1.10
diff -p -u -r1.10 mbswidth.m4
--- m4/mbswidth.m4 31 Dec 2002 13:43:06 -0000 1.10
+++ m4/mbswidth.m4 11 Sep 2003 08:59:33 -0000
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
dnl autoconf tests required for use of mbswidth.c
dnl From Bruno Haible.
@@ -13,9 +13,7 @@ AC_DEFUN([gl_MBSWIDTH],
AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth,
[AC_TRY_COMPILE([
/* AIX 3.2.5 declares wcwidth in <string.h>. */
-#if HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
#if HAVE_WCHAR_H
# include <wchar.h>
#endif
Index: m4/mkstemp.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mkstemp.m4,v
retrieving revision 1.8
diff -p -u -r1.8 mkstemp.m4
--- m4/mkstemp.m4 27 Aug 2003 11:13:17 -0000 1.8
+++ m4/mkstemp.m4 11 Sep 2003 08:59:33 -0000
@@ -57,7 +57,6 @@ AC_DEFUN([gl_PREREQ_MKSTEMP],
# Prerequisites of lib/tempname.c.
AC_DEFUN([jm_PREREQ_TEMPNAME],
[
- AC_REQUIRE([AC_HEADER_STDC])
AC_REQUIRE([AC_HEADER_STAT])
AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h)
AC_CHECK_HEADERS(stdint.h)
Index: m4/prereq.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/prereq.m4,v
retrieving revision 1.60
diff -p -u -r1.60 prereq.m4
--- m4/prereq.m4 17 Aug 2003 05:08:45 -0000 1.60
+++ m4/prereq.m4 11 Sep 2003 08:59:33 -0000
@@ -1,4 +1,4 @@
-#serial 35
+#serial 36
dnl We use jm_ for non Autoconf macros.
m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -114,19 +114,10 @@ AC_DEFUN([jm_PREREQ],
AC_REQUIRE([jm_FUNC_REALLOC])
AC_REQUIRE([jm_FUNC_STAT])
AC_REQUIRE([jm_FUNC_UTIME])
- AC_REQUIRE([jm_PREREQ_ADDEXT])
AC_REQUIRE([jm_PREREQ_STAT])
AC_REQUIRE([jm_XSTRTOIMAX])
AC_REQUIRE([jm_XSTRTOUMAX])
AC_REQUIRE([vb_FUNC_RENAME])
-])
-
-AC_DEFUN([jm_PREREQ_ADDEXT],
-[
- dnl For addext.c.
- AC_REQUIRE([AC_SYS_LONG_FILE_NAMES])
- AC_CHECK_FUNCS(pathconf)
- AC_CHECK_HEADERS(limits.h string.h unistd.h)
])
AC_DEFUN([jm_PREREQ_STAT],
Index: m4/readdir.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/readdir.m4,v
retrieving revision 1.11
diff -p -u -r1.11 readdir.m4
--- m4/readdir.m4 16 Aug 2003 09:37:15 -0000 1.11
+++ m4/readdir.m4 11 Sep 2003 08:59:33 -0000
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
dnl SunOS's readdir is broken in such a way that rm.c has to add extra code
dnl to test whether a NULL return value really means there are no more files
@@ -18,7 +18,6 @@ dnl Written by Jim Meyering.
AC_DEFUN([GL_FUNC_READDIR],
[dnl
AC_REQUIRE([AC_HEADER_DIRENT])
-AC_CHECK_HEADERS_ONCE(string.h)
AC_CACHE_CHECK([for working readdir], gl_cv_func_working_readdir,
[dnl
# Arrange for deletion of the temporary directory this test creates, in
@@ -28,9 +27,7 @@ AC_CACHE_CHECK([for working readdir], gl
AC_TRY_RUN(
[# include <stdio.h>
# include <sys/types.h>
-# if HAVE_STRING_H
-# include <string.h>
-# endif
+# include <string.h>
# ifdef HAVE_DIRENT_H
# include <dirent.h>
Index: m4/readutmp.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/readutmp.m4,v
retrieving revision 1.2
diff -p -u -r1.2 readutmp.m4
--- m4/readutmp.m4 16 Aug 2003 03:51:49 -0000 1.2
+++ m4/readutmp.m4 11 Sep 2003 08:59:33 -0000
@@ -1,4 +1,4 @@
-# readutmp.m4 serial 2
+# readutmp.m4 serial 3
dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -58,6 +58,5 @@ $ac_includes_default
# Prerequisites of lib/readutmp.c.
AC_DEFUN([gl_PREREQ_READUTMP],
[
- AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS_ONCE(string.h)
+ :
])
Index: m4/strdup.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strdup.m4,v
retrieving revision 1.1
diff -p -u -r1.1 strdup.m4
--- m4/strdup.m4 31 Dec 2002 13:42:07 -0000 1.1
+++ m4/strdup.m4 11 Sep 2003 08:59:34 -0000
@@ -1,5 +1,5 @@
-# strdup.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strdup.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -16,7 +16,6 @@ AC_DEFUN([gl_FUNC_STRDUP],
# Prerequisites of lib/strdup.c.
AC_DEFUN([gl_PREREQ_STRDUP], [
- AC_REQUIRE([AC_HEADER_STDC])
:
])
Index: m4/strftime.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strftime.m4,v
retrieving revision 1.28
diff -p -u -r1.28 strftime.m4
--- m4/strftime.m4 16 Aug 2003 05:38:25 -0000 1.28
+++ m4/strftime.m4 11 Sep 2003 08:59:34 -0000
@@ -1,4 +1,4 @@
-#serial 20
+#serial 21
dnl This macro is intended to be used solely in this file.
dnl These are the prerequisite macros for GNU's strftime.c replacement.
@@ -7,9 +7,8 @@ AC_DEFUN([_jm_STRFTIME_PREREQS],
dnl strftime.c uses the underyling system strftime if it exists.
AC_FUNC_STRFTIME
- AC_CHECK_HEADERS_ONCE(limits.h)
- AC_CHECK_FUNCS_ONCE(memcpy mempcpy)
- AC_CHECK_FUNCS(tzset memset)
+ AC_CHECK_FUNCS_ONCE(mempcpy)
+ AC_CHECK_FUNCS(tzset)
# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
AC_STRUCT_TIMEZONE
@@ -29,7 +28,6 @@ AC_DEFUN([jm_FUNC_GNU_STRFTIME],
_jm_STRFTIME_PREREQS
AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
AC_CHECK_HEADERS_ONCE(sys/time.h)
AC_DEFINE([my_strftime], [nstrftime],
[Define to the name of the strftime replacement function.])
Index: m4/strtod.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strtod.m4,v
retrieving revision 1.4
diff -p -u -r1.4 strtod.m4
--- m4/strtod.m4 31 Jan 2003 15:47:03 -0000 1.4
+++ m4/strtod.m4 11 Sep 2003 08:59:34 -0000
@@ -1,4 +1,4 @@
-# strtod.m4 serial 2
+# strtod.m4 serial 3
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -20,6 +20,5 @@ AC_DEFUN([gl_FUNC_STRTOD],
# The need for pow() is already handled by AC_FUNC_STRTOD.
AC_DEFUN([gl_PREREQ_STRTOD], [
AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS(float.h)
AC_CHECK_FUNCS_ONCE(isascii)
])
Index: m4/strtoimax.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strtoimax.m4,v
retrieving revision 1.2
diff -p -u -r1.2 strtoimax.m4
--- m4/strtoimax.m4 17 May 2003 11:52:47 -0000 1.2
+++ m4/strtoimax.m4 11 Sep 2003 08:59:34 -0000
@@ -1,4 +1,4 @@
-# strtoimax.m4 serial 2
+# strtoimax.m4 serial 3
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -32,8 +32,6 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
# Prerequisites of lib/strtoimax.c.
AC_DEFUN([gl_PREREQ_STRTOIMAX], [
jm_AC_TYPE_INTMAX_T
- AC_CHECK_HEADERS_ONCE(stdlib.h)
- AC_CHECK_DECLS_ONCE(strtol)
AC_CHECK_DECLS(strtoll)
AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
])
Index: m4/strtol.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strtol.m4,v
retrieving revision 1.1
diff -p -u -r1.1 strtol.m4
--- m4/strtol.m4 31 Dec 2002 13:42:07 -0000 1.1
+++ m4/strtol.m4 11 Sep 2003 08:59:34 -0000
@@ -1,5 +1,5 @@
-# strtol.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strtol.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -17,6 +17,5 @@ AC_DEFUN([gl_FUNC_STRTOL],
# Prerequisites of lib/strtol.c.
AC_DEFUN([gl_PREREQ_STRTOL], [
AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS_ONCE(limits.h)
AC_CHECK_FUNCS_ONCE(isascii)
])
Index: m4/strtoumax.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strtoumax.m4,v
retrieving revision 1.2
diff -p -u -r1.2 strtoumax.m4
--- m4/strtoumax.m4 17 May 2003 11:52:47 -0000 1.2
+++ m4/strtoumax.m4 11 Sep 2003 08:59:34 -0000
@@ -1,4 +1,4 @@
-# strtoumax.m4 serial 2
+# strtoumax.m4 serial 3
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -32,8 +32,6 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
# Prerequisites of lib/strtoumax.c.
AC_DEFUN([gl_PREREQ_STRTOUMAX], [
jm_AC_TYPE_UINTMAX_T
- AC_CHECK_HEADERS_ONCE(stdlib.h)
- AC_CHECK_DECLS_ONCE(strtoul)
AC_CHECK_DECLS(strtoull)
AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
])
Index: m4/userspec.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/userspec.m4,v
retrieving revision 1.2
diff -p -u -r1.2 userspec.m4
--- m4/userspec.m4 29 May 2003 07:21:59 -0000 1.2
+++ m4/userspec.m4 11 Sep 2003 08:59:34 -0000
@@ -1,4 +1,4 @@
-# userspec.m4 serial 2
+# userspec.m4 serial 3
dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -9,7 +9,6 @@ dnl the same distribution terms as the r
AC_DEFUN([gl_USERSPEC],
[
dnl Prerequisites of lib/userspec.c.
- AC_REQUIRE([AC_HEADER_STDC])
AC_REQUIRE([AC_FUNC_ALLOCA])
- AC_CHECK_HEADERS_ONCE(string.h sys/param.h unistd.h)
+ AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
])
Index: m4/xalloc.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/xalloc.m4,v
retrieving revision 1.2
diff -p -u -r1.2 xalloc.m4
--- m4/xalloc.m4 19 Aug 2003 11:32:28 -0000 1.2
+++ m4/xalloc.m4 11 Sep 2003 08:59:34 -0000
@@ -1,4 +1,4 @@
-# xalloc.m4 serial 2
+# xalloc.m4 serial 3
dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -14,7 +14,6 @@ AC_DEFUN([gl_XALLOC],
# Prerequisites of lib/xmalloc.c.
AC_DEFUN([gl_PREREQ_XMALLOC], [
- AC_REQUIRE([AC_HEADER_STDC])
AC_REQUIRE([jm_FUNC_MALLOC])
AC_REQUIRE([jm_FUNC_REALLOC])
])
Index: m4/xstrtod.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/xstrtod.m4,v
retrieving revision 1.1
diff -p -u -r1.1 xstrtod.m4
--- m4/xstrtod.m4 31 Dec 2002 13:42:07 -0000 1.1
+++ m4/xstrtod.m4 11 Sep 2003 08:59:34 -0000
@@ -1,5 +1,5 @@
-# xstrtod.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# xstrtod.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -9,5 +9,5 @@ dnl the same distribution terms as the r
# Prerequisites of lib/xstrtod.c.
AC_DEFUN([gl_XSTRTOD],
[
- AC_REQUIRE([AC_HEADER_STDC])
+ :
])
Index: m4/xstrtol.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/xstrtol.m4,v
retrieving revision 1.3
diff -p -u -r1.3 xstrtol.m4
--- m4/xstrtol.m4 29 May 2003 07:21:59 -0000 1.3
+++ m4/xstrtol.m4 11 Sep 2003 08:59:34 -0000
@@ -1,4 +1,4 @@
-# xstrtol.m4 serial 2
+# xstrtol.m4 serial 3
dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
@@ -24,9 +24,7 @@ AC_DEFUN([gl_PREREQ_XSTRTOL],
[
AC_REQUIRE([gl_PREREQ_XSTRTOL_H])
AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS_ONCE(string.h)
AC_CHECK_FUNCS_ONCE(isascii)
- AC_CHECK_DECLS_ONCE(strtol strtoul)
AC_CHECK_DECLS([strtoimax, strtoumax])
])