projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(my_strtoumax): Fix typo in computing
[gnulib.git]
/
lib
/
path-concat.c
diff --git
a/lib/path-concat.c
b/lib/path-concat.c
index
b0c18a8
..
86579b7
100644
(file)
--- a/
lib/path-concat.c
+++ b/
lib/path-concat.c
@@
-1,5
+1,5
@@
/* path-concat.c -- concatenate two arbitrary pathnames
/* path-concat.c -- concatenate two arbitrary pathnames
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997
, 1998
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#if
def
HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
@@
-26,7
+26,7
@@
#endif
#include <stdio.h>
#endif
#include <stdio.h>
-#if
def
HAVE_STRING_H
+#if HAVE_STRING_H
# include <string.h>
#endif
#include <sys/types.h>
# include <string.h>
#endif
#include <sys/types.h>
@@
-42,10
+42,7
@@
char *malloc ();
BASE in the returned concatenation. */
char *
BASE in the returned concatenation. */
char *
-path_concat (dir, base, base_in_result)
- const char *dir;
- const char *base;
- char **base_in_result;
+path_concat (const char *dir, const char *base, char **base_in_result)
{
char *p;
char *p_concat;
{
char *p;
char *p_concat;