projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regex: avoid compilation failure with upcoming gcc-4.4
[gnulib.git]
/
lib
/
filename.h
diff --git
a/lib/filename.h
b/lib/filename.h
index
c961d3a
..
439689e
100644
(file)
--- 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
-2008
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
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
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
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
#ifndef _FILENAME_H
#define _FILENAME_H
@@
-47,10
+46,6
@@
extern "C" {
# define FILE_SYSTEM_PREFIX_LEN(P) 0
#endif
# 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
}
#ifdef __cplusplus
}