X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpath-concat.c;h=db96debad6dc1028e84de12707acd26582a8ae70;hb=0df2580e13bb5523b7f5569e9bec1fda9c812677;hp=3a143c7aaa3cd0f80b3eb2dd51dd1903897cfa6d;hpb=17bef6778d88a558ae4b059d649a44b00754c38c;p=gnulib.git

diff --git a/lib/path-concat.c b/lib/path-concat.c
index 3a143c7aa..db96debad 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, 2004 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -23,43 +23,24 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "path-concat.h"
+
 #ifndef HAVE_MEMPCPY
 # define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
 #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
-
+#include "strdup.h"
 #include "dirname.h"
 #include "xalloc.h"
-#include "path-concat.h"
 
 /* Concatenate two pathname components, DIR and BASE, in
    newly-allocated storage and return the result.  Return 0 if out of