[src/trunk]: src/sys/net Protect zlib.h with the same symbol as userland.

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

details:   https://anonhg.NetBSD.org/src/rev/735d8c9564b4
branches:  trunk
changeset: 586252:735d8c9564b4
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Dec 11 19:15:38 2005 +0000

description:
Protect zlib.h with the same symbol as userland.
XXX: We should either not install this, or have only one copy.

diffstat:

 sys/net/zlib.h |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r abd725c242c7 -r 735d8c9564b4 sys/net/zlib.h
--- a/sys/net/zlib.h    Sun Dec 11 18:48:51 2005 +0000
+++ b/sys/net/zlib.h    Sun Dec 11 19:15:38 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: zlib.h,v 1.10 2005/12/10 23:21:39 elad Exp $ */
+/* $NetBSD: zlib.h,v 1.11 2005/12/11 19:15:38 christos Exp $ */
 
 /* zlib.h -- interface of the 'zlib' general purpose compression library
   version 1.1.4, March 11th, 2002
@@ -43,7 +43,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zlib.h,v 1.10 2005/12/10 23:21:39 elad Exp $ */
+/* @(#) $Id: zlib.h,v 1.11 2005/12/11 19:15:38 christos Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
@@ -321,9 +321,11 @@
 #   pragma map(inflate_trees_free,"INTRFR")
 #endif
 
-#endif /* _ZCONF_H */
+#endif /* !_ZCONF_H */
 /* --- zconf.h */
 
+#ifndef _ZLIB_H
+#define _ZLIB_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1194,6 +1196,7 @@
 #ifdef __cplusplus
 }
 #endif
+#endif /* !_ZLIB_H */
 
 #endif /* !_NET_ZLIB_H_ */
 /* -- zlib.h */