[Bug-gnulib] path-concat patches to assume C89 or better

[Paul Eggert]

I installed this:

2003-09-09  Paul Eggert  <address@hidden>

        * path-concat.c: Include <stdlib.h>, <string.h> unconditionally.
        * path-concat.m4 (gl_PATH_CONCAT): Don't check for standard C
        headers, memory.h, stdlib.h, string.h, strings.h.

Index: lib/path-concat.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/path-concat.c,v
retrieving revision 1.16
diff -p -u -r1.16 path-concat.c
--- lib/path-concat.c   23 Feb 2002 09:02:18 -0000      1.16
+++ lib/path-concat.c   9 Sep 2003 23:02:12 -0000
@@ -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,29 +28,11 @@
 #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
Index: m4/path-concat.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/path-concat.m4,v
retrieving revision 1.1
diff -p -u -r1.1 path-concat.m4
--- m4/path-concat.m4   31 Dec 2002 13:42:07 -0000      1.1
+++ m4/path-concat.m4   9 Sep 2003 23:02:12 -0000
@@ -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 @@ AC_DEFUN([gl_PATH_CONCAT],
 [
   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)
 ])