Slightly cleaner.

diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 14fb6b2..4bcd27d 100644 (file)
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.1 1997/02/26 03:06:49 downsj Exp $
+#      $OpenBSD: Makefile,v 1.2 1997/03/04 08:59:23 downsj Exp $
 
 LIB=   wrap
 SRCS=  hosts_access.c options.c shell_cmd.c rfc931.c eval.c \
@@ -11,7 +11,7 @@ HDRS= tcpd.h
 CFLAGS+=-DPROCESS_OPTIONS -DFACILITY=LOG_AUTH -DSEVERITY=LOG_INFO \
        -DRFC931_TIMEOUT=10 -DHOSTS_ACCESS -DALWAYS_HOSTNAME \
        -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
-       -DNETGROUP -DSYS_ERRLIST_DEFINED
+       -DNETGROUP -DSYS_ERRLIST_DEFINED -D_TCPD_PRIVATE
 
 MAN=   hosts_access.3 hosts_access.5 hosts_options.5
 MLINKS+=hosts_access.5 hosts.allow.5

diff --git a/lib/libwrap/tcpd.h b/lib/libwrap/tcpd.h
index aa6bd16..f6292e1 100644 (file)
--- a/lib/libwrap/tcpd.h
+++ b/lib/libwrap/tcpd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tcpd.h,v 1.1 1997/02/26 03:06:58 downsj Exp $ */
+/*     $OpenBSD: tcpd.h,v 1.2 1997/03/04 08:59:24 downsj Exp $ */
 
 /*
  * Copyright (c) 1997, Jason Downs.  All rights reserved.
@@ -201,6 +201,7 @@ extern int dry_run;                 /* verification flag */
 __END_DECLS
 
 
+#ifdef _TCPD_PRIVATE
  /*
   * What follows is an attempt to unify varargs.h and stdarg.h. I'd rather
   * have this than #ifdefs all over the code.
@@ -217,5 +218,6 @@ __END_DECLS
 #define VASTART(ap,type,name)  {type name; va_start(ap); name = va_arg(ap, type)
 #define VAEND(ap)              va_end(ap);}
 #endif
+#endif /* _TCPD_PRIVATE */
 
 #endif /* _TCPD_H_ */