diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-11-03 23:17:27 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-11-03 23:17:27 +0000 |
| commit | c437773f09dd9684683ae46730c1224e51509177 (patch) | |
| tree | 059cdebab2b7c3d2777745a501b7949d24b2e806 /lib/canonicalize.h | |
| parent | c4a99adb70b0f7d850010c26436a2facfca5fe6d (diff) | |
| download | gnulib-c437773f09dd9684683ae46730c1224e51509177.tar.gz | |
* lib/canonicalize.h: (canonicalize_mode_t, CAN_EXISTING):
(CAN_ALL_BUT_LAST, CAN_MISSING, canonicalize_filename_mode):
Define only if PROVIDE_CANONICALIZE_FILENAME_MODE is defined.
* m4/canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME):
Check for functions and headers just once.
Check for declaration of canonicalize_file_name.
Define PROVIDE_CANONICALIZE_FILENAME_MODE.
Diffstat (limited to 'lib/canonicalize.h')
| -rw-r--r-- | lib/canonicalize.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/canonicalize.h b/lib/canonicalize.h index 4cae3c5512..deaf27f130 100644 --- a/lib/canonicalize.h +++ b/lib/canonicalize.h @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2005 Free Software Foundation, Inc. + Copyright (C) 1996-2006 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 @@ -19,6 +19,7 @@ #ifndef CANONICALIZE_H_ # define CANONICALIZE_H_ +# ifdef PROVIDE_CANONICALIZE_FILENAME_MODE enum canonicalize_mode_t { /* All components must exist. */ @@ -33,8 +34,11 @@ enum canonicalize_mode_t typedef enum canonicalize_mode_t canonicalize_mode_t; char *canonicalize_filename_mode (const char *, canonicalize_mode_t); +# endif -# if !HAVE_CANONICALIZE_FILE_NAME +# if HAVE_DECL_CANONICALIZE_FILE_NAME +# include <stdlib.h> +# else char *canonicalize_file_name (const char *); # endif |