[src/netbsd-1-5]: src/sys/net Revert pull-up of revision 1.13 (requested by he):

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

details:   https://anonhg.NetBSD.org/src/rev/d95ae12d98e9
branches:  netbsd-1-5
changeset: 492983:d95ae12d98e9
user:      he <he%NetBSD.org@localhost>
date:      Thu Mar 21 19:32:37 2002 +0000

description:
Revert pull-up of revision 1.13 (requested by he):
  Need to reexpose local definition of MAX.

diffstat:

 sys/net/zlib.c |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (83 lines):

diff -r 808e7c99b5a1 -r d95ae12d98e9 sys/net/zlib.c
--- a/sys/net/zlib.c    Wed Mar 20 23:44:53 2002 +0000
+++ b/sys/net/zlib.c    Thu Mar 21 19:32:37 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $ */
+/*     $NetBSD: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $ */
 /*
  * This file is derived from various .h and .c files from the zlib-1.0.4
  * distribution by Jean-loup Gailly and Mark Adler, with some additions
@@ -11,7 +11,7 @@
  * - added inflateIncomp and deflateOutputPending
  * - allow strm->next_out to be NULL, meaning discard the output
  *
- * $Id: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $
+ * $Id: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $
  */
 
 /* 
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $");
 
 #define NO_DUMMY_DECL
 #define NO_ZCFUNCS
@@ -45,7 +45,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $ */
+/* @(#) $Id: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
@@ -293,7 +293,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* @(#) $Id: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $ */
+/* @(#) $Id: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H
@@ -655,7 +655,7 @@
  *
  */
 
-/* @(#) $Id: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $ */
+/* @(#) $Id: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $ */
 
 /* #include "deflate.h" */
 
@@ -2017,7 +2017,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $Id: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $ */
+/* @(#) $Id: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $ */
 
 /* #define GEN_TREES_H */
 
@@ -2066,6 +2066,10 @@
  * more than 16 bits on some systems.)
  */
 
+
+#define MAX(a,b) (a >= b ? a : b)
+/* the arguments must not have side effects */
+
 /* ===========================================================================
  * Local data. These are initialized only once.
  */
@@ -5875,7 +5879,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $Id: zlib.c,v 1.10.4.1 2002/03/20 23:18:36 he Exp $ */
+/* @(#) $Id: zlib.c,v 1.10.4.2 2002/03/21 19:32:37 he Exp $ */
 
 /* #include "zlib.h" */