[src/trunk]: src/include deal with bsearch duplicate declaration.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53013280f12f
branches:  trunk
changeset: 500919:53013280f12f
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 20 18:35:21 2000 +0000

description:
deal with bsearch duplicate declaration.

diffstat:

 include/search.h |   6 +++++-
 include/stdlib.h |  10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 7df585382a8f -r 53013280f12f include/search.h
--- a/include/search.h  Wed Dec 20 16:53:50 2000 +0000
+++ b/include/search.h  Wed Dec 20 18:35:21 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: search.h,v 1.13 2000/06/13 01:21:53 simonb Exp $       */
+/*     $NetBSD: search.h,v 1.14 2000/12/20 18:35:21 christos Exp $     */
 
 /*
  * Written by J.T. Conklin <jtc%netbsd.org@localhost>
@@ -40,8 +40,12 @@
 #endif
 
 __BEGIN_DECLS
+#ifndef __BSEARCH_DECLARED
+#define __BSEARCH_DECLARED
+/* also in stdlib.h */
 void   *bsearch __P((const void *, const void *, size_t, size_t,
                      int (*)(const void *, const void *)));
+#endif /* __BSEARCH_DECLARED */
 int     hcreate __P((size_t));
 void    hdestroy __P((void));
 ENTRY  *hsearch __P((ENTRY, ACTION));
diff -r 7df585382a8f -r 53013280f12f include/stdlib.h
--- a/include/stdlib.h  Wed Dec 20 16:53:50 2000 +0000
+++ b/include/stdlib.h  Wed Dec 20 18:35:21 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stdlib.h,v 1.50 2000/11/15 15:44:05 briggs Exp $       */
+/*     $NetBSD: stdlib.h,v 1.51 2000/12/20 18:35:21 christos Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -105,8 +105,12 @@
 double  atof __P((const char *));
 int     atoi __P((const char *));
 long    atol __P((const char *));
-void   *bsearch __P((const void *, const void *, size_t,
-           size_t, int (*)(const void *, const void *)));
+#ifndef __BSEARCH_DECLARED
+#define __BSEARCH_DECLARED
+/* also in search.h */
+void   *bsearch __P((const void *, const void *, size_t, size_t,
+    int (*)(const void *, const void *)));
+#endif /* __BSEARCH_DECLARED */
 void   *calloc __P((size_t, size_t));
 div_t   div __P((int, int));
 __dead  void exit __P((int)) __attribute__((__noreturn__));