X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fcanonicalize.h;h=04ad79cee767adff5d023cb7c8ff027d04580dfd;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=5c4d3f1a5e32e841800865fdb474cf9ec6f96a9e;hpb=93d45a6cea3e8c0959a430e0b3f5ae24fc600399;p=gnulib.git
diff --git a/lib/canonicalize.h b/lib/canonicalize.h
index 5c4d3f1a5..04ad79cee 100644
--- a/lib/canonicalize.h
+++ b/lib/canonicalize.h
@@ -1,10 +1,10 @@
/* Return the canonical absolute name of a given file.
- Copyright (C) 1996-2007 Free Software Foundation, Inc.
+ Copyright (C) 1996-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
@@ -12,14 +12,13 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING.
- If not, write to the Free Software Foundation,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#ifndef CANONICALIZE_H_
# define CANONICALIZE_H_
-# if GNULIB_CANONICALIZE
+#include /* for canonicalize_file_name */
+
enum canonicalize_mode_t
{
/* All components must exist. */
@@ -38,17 +37,5 @@ typedef enum canonicalize_mode_t canonicalize_mode_t;
whether components must exist depends on the canonicalize_mode_t
argument. */
char *canonicalize_filename_mode (const char *, canonicalize_mode_t);
-# endif
-
-# if HAVE_DECL_CANONICALIZE_FILE_NAME
-# include
-# else
-/* Return a malloc'd string containing the canonical absolute name of
- the named file. If any file name component does not exist or is a
- symlink to a nonexistent file, return NULL. A canonical name does
- not contain any `.', `..' components nor any repeated file name
- separators ('/') or symlinks. */
-char *canonicalize_file_name (const char *);
-# endif
#endif /* !CANONICALIZE_H_ */