[src/netbsd-1-4]: src/lib/libwrap Pull up revisions 1.9, 1.11 (via patch, requ...

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

details:   https://anonhg.NetBSD.org/src/rev/f9b74ddc5360
branches:  netbsd-1-4
changeset: 471330:f9b74ddc5360
user:      he <he%NetBSD.org@localhost>
date:      Thu Mar 07 21:15:23 2002 +0000

description:
Pull up revisions 1.9,1.11 (via patch, requested by he):
  Include required files, and wrap declarations in __BEGIN_DECLS/
  __END_DECLS.
This appears to be required to compile the newest openssh from pkgsrc.

diffstat:

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

diffs (66 lines):

diff -r 7fe569f89547 -r f9b74ddc5360 lib/libwrap/tcpd.h
--- a/lib/libwrap/tcpd.h        Wed Jan 16 09:36:35 2002 +0000
+++ b/lib/libwrap/tcpd.h        Thu Mar 07 21:15:23 2002 +0000
@@ -1,10 +1,13 @@
-/*     $NetBSD: tcpd.h,v 1.4 1999/01/18 19:54:20 christos Exp $        */
+/*     $NetBSD: tcpd.h,v 1.4.2.1 2002/03/07 21:15:23 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. */
 
 #define STRING_LENGTH  128             /* hosts, users, processes */
@@ -56,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))
 
@@ -65,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 *));
@@ -174,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
@@ -199,6 +208,7 @@
   * behavior.
   */
 
+__BEGIN_DECLS
 extern void process_options            /* execute options */
                __P((char *, struct request_info *));
 extern int dry_run;                    /* verification flag */
@@ -241,3 +251,4 @@
 #define strtok my_strtok
 extern char *my_strtok __P((char *, char *));
 #endif
+__END_DECLS