X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffilenamecat.h;h=31b33759c2f54dd921464c102c08b70e58973579;hb=ce05829e2da40a92966f0e3d78d1b40c6f1e85b5;hp=28f8c3fb3c845164e4958aa3d5551c1043fb80ea;hpb=fe32d83182dd651bbdaee9a8b6a54c6e3ad9ad2e;p=gnulib.git

diff --git a/lib/filenamecat.h b/lib/filenamecat.h
index 28f8c3fb3..31b33759c 100644
--- a/lib/filenamecat.h
+++ b/lib/filenamecat.h
@@ -1,11 +1,12 @@
 /* Concatenate two arbitrary file names.
 
-   Copyright (C) 1996, 1997, 2003, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2011 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,13 +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);
+                         char **base_in_result);