Mercurial > hg > octave-nkf > gnulib-hg
changeset 4668:00d938cc4d73
Remove K&R cruft.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Tue, 09 Sep 2003 23:25:33 +0000 |
parents | 117a6d2af03b |
children | c7ad68a45173 |
files | lib/path-concat.c m4/path-concat.m4 |
diffstat | 2 files changed, 6 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/path-concat.c +++ b/lib/path-concat.c @@ -1,6 +1,6 @@ /* path-concat.c -- concatenate two arbitrary pathnames - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -28,31 +28,13 @@ #endif #include <stdio.h> +#include <stdlib.h> +#include <string.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 #if HAVE_UNISTD_H # include <unistd.h> #endif -#ifndef HAVE_DECL_MALLOC -"this configure-time declaration test was not run" -#endif -#if !HAVE_DECL_MALLOC -char *malloc (); -#endif - #ifndef strdup char *strdup (); #endif
--- a/m4/path-concat.m4 +++ b/m4/path-concat.m4 @@ -1,5 +1,5 @@ -# path-concat.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# path-concat.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 @@ -10,8 +10,6 @@ [ dnl Prerequisites of lib/path-concat.c. AC_REQUIRE([jm_AC_DOS]) - AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_HEADERS_ONCE(memory.h stdlib.h string.h strings.h unistd.h) + AC_CHECK_HEADERS_ONCE(unistd.h) AC_CHECK_FUNCS_ONCE(mempcpy) - AC_CHECK_DECLS_ONCE(malloc) ])