diff options
-rw-r--r-- | security/nss/lib/ssl/ssl3con.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c index f57b6bfc6..a195812da 100644 --- a/security/nss/lib/ssl/ssl3con.c +++ b/security/nss/lib/ssl/ssl3con.c @@ -64,6 +64,10 @@ #include <stdio.h> #ifdef NSS_ENABLE_ZLIB #include "zlib.h" +/* zconf.h may define compress as a macro, which interferes with our use + * of compress as a member of the ssl3CipherSpec structure. Undo that. + */ +#undef compress #endif #ifndef PK11_SETATTRS |