projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add new standards subfile
[gnulib.git]
/
lib
/
search.in.h
diff --git
a/lib/search.in.h
b/lib/search.in.h
index
b41abdc
..
62937c7
100644
(file)
--- a/
lib/search.in.h
+++ b/
lib/search.in.h
@@
-1,11
+1,11
@@
/* A GNU-like <search.h>.
/* A GNU-like <search.h>.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 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
@@
-13,13
+13,15
@@
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 _GL_SEARCH_H
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SEARCH_H@
#ifndef _GL_SEARCH_H
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_SEARCH_H@
+# if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+# endif
# @INCLUDE_NEXT@ @NEXT_SEARCH_H@
#endif
# @INCLUDE_NEXT@ @NEXT_SEARCH_H@
#endif
@@
-36,12
+38,19
@@
extern "C" {
#if @GNULIB_TSEARCH@
#if @GNULIB_TSEARCH@
-# if !@HAVE_TSEARCH@
+# if @REPLACE_TSEARCH@
+# define tsearch rpl_tsearch
+# define tfind rpl_tfind
+# define tdelete rpl_tdelete
+# define twalk rpl_twalk
+# endif
+# if !@HAVE_TSEARCH@ || @REPLACE_TSEARCH@
/* See <http://www.opengroup.org/susv3xbd/search.h.html>,
<http://www.opengroup.org/susv3xsh/tsearch.html>
for details. */
/* See <http://www.opengroup.org/susv3xbd/search.h.html>,
<http://www.opengroup.org/susv3xsh/tsearch.html>
for details. */
+# if !@HAVE_TSEARCH@
typedef enum
{
preorder,
typedef enum
{
preorder,
@@
-50,6
+59,7
@@
typedef enum
leaf
}
VISIT;
leaf
}
VISIT;
+# endif
/* Searches an element in the tree *VROOTP that compares equal to KEY.
If one is found, it is returned. Otherwise, a new element equal to KEY
/* Searches an element in the tree *VROOTP that compares equal to KEY.
If one is found, it is returned. Otherwise, a new element equal to KEY