projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'dummy'.
[gnulib.git]
/
lib
/
path-concat.c
diff --git
a/lib/path-concat.c
b/lib/path-concat.c
index
3a143c7
..
db96deb
100644
(file)
--- a/
lib/path-concat.c
+++ b/
lib/path-concat.c
@@
-1,6
+1,6
@@
/* path-concat.c -- concatenate two arbitrary pathnames
/* 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
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-23,43
+23,24
@@
# include <config.h>
#endif
# 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>
#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
#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 "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
/* Concatenate two pathname components, DIR and BASE, in
newly-allocated storage and return the result. Return 0 if out of