X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffilename.h;h=7b89d0d06b2bc6016c5418172f2d8598ae25fccc;hb=9500a55f083bb8e55ee938e4532ae6baea702e6b;hp=c961d3af317fe26a89509a776ede8df597c4a852;hpb=94a1038450d4bf8222e18b3d4b55b2084db42f26;p=gnulib.git

diff --git a/lib/filename.h b/lib/filename.h
index c961d3af3..7b89d0d06 100644
--- a/lib/filename.h
+++ b/lib/filename.h
@@ -1,10 +1,10 @@
-/* Pathname support.
-   Copyright (C) 2001-2004, 2007 Free Software Foundation, Inc.
+/* Basic filename support macros.
+   Copyright (C) 2001-2004, 2007-2012 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
@@ -12,8 +12,7 @@
    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/>.  */
 
 #ifndef _FILENAME_H
 #define _FILENAME_H
@@ -30,7 +29,7 @@ extern "C" {
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, Cygwin, OS/2, DOS */
+  /* Native Windows, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 # define HAS_DEVICE(P) \
     ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
@@ -47,10 +46,6 @@ extern "C" {
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Concatenate a directory filename, a relative filename and an optional
-   suffix.  Return a freshly allocated filename.  */
-extern char *concatenated_filename (const char *directory,
-				    const char *filename, const char *suffix);
 
 #ifdef __cplusplus
 }