[src/netbsd-1-5]: src/lib/libwrap Pull up revision 1.11 (via patch, requested...

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

details:   https://anonhg.NetBSD.org/src/rev/341234cd7ff5
branches:  netbsd-1-5
changeset: 491029:341234cd7ff5
user:      he <he%NetBSD.org@localhost>
date:      Fri Mar 30 22:40:56 2001 +0000

description:
Pull up revision 1.11 (via patch, requested by kleink):
  Correctly wrap external declarations inside __{BEGIN,END}_DECLS
  to correct C/C++ external linkage.  Fixes PR#12458.

diffstat:

 lib/libwrap/tcpd.h |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (64 lines):

diff -r d022b4b8b7d8 -r 341234cd7ff5 lib/libwrap/tcpd.h
--- a/lib/libwrap/tcpd.h        Fri Mar 30 22:37:49 2001 +0000
+++ b/lib/libwrap/tcpd.h        Fri Mar 30 22:40:56 2001 +0000
@@ -1,10 +1,11 @@
-/*     $NetBSD: tcpd.h,v 1.9 2000/02/05 19:14:57 danw Exp $    */
+/*     $NetBSD: tcpd.h,v 1.9.4.1 2001/03/30 22:40:56 he Exp $  */
  /*
   * @(#) tcpd.h 1.5 96/03/19 16:22:24
   * 
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   */
 
+#include <sys/cdefs.h>
 #include <stdio.h>
 
 /* Structure to describe one communications endpoint. */
@@ -58,8 +59,10 @@
 #define STRING_UNKNOWN "unknown"       /* lookup failed */
 #define STRING_PARANOID        "paranoid"      /* hostname conflict */
 
+__BEGIN_DECLS
 extern char unknown[];
 extern char paranoid[];
+__END_DECLS
 
 #define HOSTNAME_KNOWN(s) (STR_NE((s),unknown) && STR_NE((s),paranoid))
 
@@ -67,6 +70,7 @@
 
 /* Global functions. */
 
+__BEGIN_DECLS
 #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
 extern void fromhost                   /* get/validate client host info */
                __P((struct request_info *));
@@ -176,12 +180,15 @@
                __P((char *, ...));
 extern void tcpd_jump                  /* report problem and jump */
                __P((char *, ...));
+__END_DECLS
 
 struct tcpd_context {
     char   *file;                      /* current file */
     int     line;                      /* current line */
 };
+__BEGIN_DECLS
 extern struct tcpd_context tcpd_context;
+__END_DECLS
 
  /*
   * While processing access control rules, error conditions are handled by
@@ -201,6 +208,7 @@
   * behavior.
   */
 
+__BEGIN_DECLS
 extern void process_options            /* execute options */
                __P((char *, struct request_info *));
 extern int dry_run;                    /* verification flag */
@@ -243,3 +251,4 @@
 #define strtok my_strtok
 extern char *my_strtok __P((char *, char *));
 #endif
+__END_DECLS