summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-09-10 09:06:51 +0000
committerJim Meyering <jim@meyering.net>2003-09-10 09:06:51 +0000
commit4c50a3aea2cd490a400bcc363412eee59585b075 (patch)
tree260befd3bfa549b01ea7d76d497108a4b44f8df9
parent165cfed262ccccf6d6790910f5dafc2af3ac5383 (diff)
downloadcoreutils-4c50a3aea2cd490a400bcc363412eee59585b075.tar.xz
Include <stdlib.h>, <string.h> unconditionally.
-rw-r--r--lib/path-concat.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/lib/path-concat.c b/lib/path-concat.c
index 3a143c7aa..7f3bc5a49 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