-#if __STDC__
-# undef __P
-# define __P(args) args
-#else
-# define __P(args) ()
-#endif
+/* Concatenate two arbitrary pathnames.
+
+ Copyright (C) 1996, 1997, 2003 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
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-char *
-path_concat __P ((const char *dir, const char *base, char **base_in_result));
+/* Written by Jim Meyering. */
+
+#if ! defined PATH_CONCAT_H_
+# define PATH_CONCAT_H_
+
+char *path_concat (const char *dir, const char *base, char **base_in_result);
+
+#endif