X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffilenamecat.h;h=b33dce8438efc73fec226285cd03a189724ea977;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=c943b67d77ed6b5bfb38e7b24fd091e60726068d;hpb=359c0a71713e606f440d40f55a43c77349df2aaa;p=gnulib.git

diff --git a/lib/filenamecat.h b/lib/filenamecat.h
index c943b67d7..b33dce843 100644
--- a/lib/filenamecat.h
+++ b/lib/filenamecat.h
@@ -1,11 +1,12 @@
 /* Concatenate two arbitrary file names.
 
-   Copyright (C) 1996, 1997, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2014 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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.
+   the Free Software Foundation; either version 3 of the License, 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
@@ -13,10 +14,14 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering.  */
 
+#if GNULIB_FILENAMECAT
 char *file_name_concat (char const *dir, char const *base,
-			char **base_in_result);
+                        char **base_in_result);
+#endif
+
+char *mfile_name_concat (char const *dir, char const *base,
+                         char **base_in_result);