From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Sep 2003 23:25:33 +0000 (+0000)
Subject: Remove K&R cruft.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1223977f6e12326fc3218f7848f02981495efd94;p=pspp

Remove K&R cruft.
---

diff --git a/lib/path-concat.c b/lib/path-concat.c
index 3a143c7aaa..7f3bc5a494 100644
--- 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
diff --git a/m4/path-concat.m4 b/m4/path-concat.m4
index 975774752d..be0534d015 100644
--- 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 @@ 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)
 ])