X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsearch.in.h;h=53f3bbd496eff703a97c50b1f6e428c46cb96695;hb=1b94e030d122eb05acd5054b711e7bf6d49994e3;hp=20551a94af3617f9422acf7b491646e1b1752cc5;hpb=23737e3dd01ef6ac0ae9134300a4c66807ae00d2;p=gnulib.git

diff --git a/lib/search.in.h b/lib/search.in.h
index 20551a94a..53f3bbd49 100644
--- a/lib/search.in.h
+++ b/lib/search.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <search.h>.
 
-   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 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
@@ -20,6 +20,7 @@
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
+@PRAGMA_COLUMNS@
 
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SEARCH_H@
@@ -52,6 +53,7 @@
    for details.  */
 
 # if !@HAVE_TSEARCH@
+#  if !GNULIB_defined_search_types
 typedef enum
 {
   preorder,
@@ -60,13 +62,18 @@ typedef enum
   leaf
 }
 VISIT;
+#   define GNULIB_defined_search_types 1
+#  endif
 # endif
 
 # ifdef __cplusplus
 extern "C" {
 # endif
+# if !GNULIB_defined_search_fn_types
 typedef int (*_gl_search_compar_fn) (const void *, const void *);
 typedef void (*_gl_search_action_fn) (const void *, VISIT, int);
+#  define GNULIB_defined_search_fn_types 1
+# endif
 # ifdef __cplusplus
 }
 # endif