summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>1998-09-13 23:37:12 +0000
committerPaul Mackerras <paulus@samba.org>1998-09-13 23:37:12 +0000
commitd983c7437fe95614316b4ce052509382d6931834 (patch)
tree44de96fa0e39f7d4f62bbb9d4bcb01fec143dcab /common
parent44e1777caa7658b455b5269f895734a5c33d2246 (diff)
downloadppp-d983c7437fe95614316b4ce052509382d6931834.tar.gz
Some systems define `u' as a macro.
Diffstat (limited to 'common')
-rw-r--r--common/zlib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/zlib.c b/common/zlib.c
index 9d1b8f2..2c4834b 100644
--- a/common/zlib.c
+++ b/common/zlib.c
@@ -10,7 +10,7 @@
* - added inflateIncomp and deflateOutputPending
* - allow strm->next_out to be NULL, meaning discard the output
*
- * $Id: zlib.c,v 1.10 1998/03/19 04:55:37 paulus Exp $
+ * $Id: zlib.c,v 1.11 1998/09/13 23:37:12 paulus Exp $
*/
/*
@@ -52,6 +52,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/systm.h>
+#undef u
# define HAVE_MEMCPY
# define memcpy(d, s, n) bcopy((s), (d), (n))
# define memset(d, v, n) bzero((d), (n))