Mercurial > hg > octave-nkf > gnulib-hg
changeset 4666:bb2816d0923f
Remove K&R cruft.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 09 Sep 2003 22:41:13 +0000 |
| parents | dc6d827f3011 |
| children | 117a6d2af03b |
| files | lib/mktime.c lib/modechange.c lib/mountlist.c m4/mktime.m4 m4/modechange.m4 m4/mountlist.m4 |
| diffstat | 6 files changed, 13 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/mktime.c +++ b/lib/mktime.c @@ -25,10 +25,6 @@ # include <config.h> #endif -#ifdef _LIBC -# define STDC_HEADERS 1 -#endif - /* Assume that leap seconds are possible, unless told otherwise. If the host has a `zic' command with a `-L leapsecondfilename' option, then it supports leap seconds; otherwise it probably doesn't. */ @@ -43,10 +39,8 @@ #if DEBUG # include <stdio.h> -# if STDC_HEADERS -# include <stdlib.h> -# include <string.h> -# endif +# include <stdlib.h> +# include <string.h> /* Make it work even if the system's libc has its own mktime routine. */ # define mktime my_mktime #endif /* DEBUG */ @@ -625,6 +619,6 @@ /* Local Variables: -compile-command: "gcc -DDEBUG -DSTDC_HEADERS -Wall -W -O -g mktime.c -o mktime" +compile-command: "gcc -DDEBUG -Wall -W -O -g mktime.c -o mktime" End: */
--- a/lib/modechange.c +++ b/lib/modechange.c @@ -34,12 +34,7 @@ #include <sys/stat.h> #include "xstrtol.h" #include <stddef.h> - -#if STDC_HEADERS -# include <stdlib.h> -#else -char *malloc (); -#endif +#include <stdlib.h> #if STAT_MACROS_BROKEN # undef S_ISDIR
--- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -21,18 +21,9 @@ #include <stdio.h> #include <sys/types.h> - +#include <stdlib.h> +#include <string.h> -#ifdef STDC_HEADERS -# include <stdlib.h> -#else -void free (); -#endif -#if defined STDC_HEADERS || defined HAVE_STRING_H -# include <string.h> -#else -# include <strings.h> -#endif #include "xalloc.h" #ifndef strstr
--- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -# mktime.m4 serial 3 +# mktime.m4 serial 4 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 @@ -199,6 +199,4 @@ ]) # Prerequisites of lib/mktime.c. -AC_DEFUN([gl_PREREQ_MKTIME], [ - AC_REQUIRE([AC_HEADER_STDC]) -]) +AC_DEFUN([gl_PREREQ_MKTIME], [:])
--- a/m4/modechange.m4 +++ b/m4/modechange.m4 @@ -1,5 +1,5 @@ -# modechange.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# modechange.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 @@ -8,6 +8,5 @@ AC_DEFUN([gl_MODECHANGE], [ - AC_REQUIRE([AC_HEADER_STDC]) AC_REQUIRE([AC_HEADER_STAT]) ])
--- a/m4/mountlist.m4 +++ b/m4/mountlist.m4 @@ -1,5 +1,5 @@ -# mountlist.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# mountlist.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 @@ -19,9 +19,8 @@ # Prerequisites of lib/mountlist.c not done by jm_LIST_MOUNTED_FILESYSTEMS. AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], [ - AC_REQUIRE([AC_HEADER_STDC]) dnl Note jm_LIST_MOUNTED_FILESYSTEMS checks for mntent.h, not sys/mntent.h. - AC_CHECK_HEADERS_ONCE(fcntl.h string.h unistd.h) + AC_CHECK_HEADERS_ONCE(fcntl.h unistd.h) AC_CHECK_HEADERS(sys/mntent.h) jm_FSTYPENAME ])