summaryrefslogtreecommitdiff
path: root/lib/path-concat.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2004-04-04 06:51:11 +0000
committerJim Meyering <jim@meyering.net>2004-04-04 06:51:11 +0000
commit8c5584a1513cdbf62e8ed51c69053db4aae44682 (patch)
tree33f6842b5ab8d3e40869af4574990cfe15c3e50e /lib/path-concat.c
parentfef16409575921ce744f360ed21800a6207d9f8f (diff)
downloadcoreutils-8c5584a1513cdbf62e8ed51c69053db4aae44682.tar.xz
Sync from gnulib.
Diffstat (limited to 'lib/path-concat.c')
-rw-r--r--lib/path-concat.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/path-concat.c b/lib/path-concat.c
index 7f3bc5a49..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, 2003 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,6 +23,9 @@
# 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
@@ -35,13 +38,9 @@
# include <unistd.h>
#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