From 0615d94be7ab74e1e587589a704dc07498b01159 Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Thu, 12 Nov 2009 05:08:27 +0000 Subject: [PATCH] Bug 275744: Mozilla's zconf.h defines 'compress' as a macro. When NSS is built as part of Mozilla, the 'compress' member of the ssl3CipherSpec structure gets renamed. Undefine 'compress' to avoid that. r=nelson. git-svn-id: svn://10.0.0.236/trunk@258982 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/ssl/ssl3con.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mozilla/security/nss/lib/ssl/ssl3con.c b/mozilla/security/nss/lib/ssl/ssl3con.c index c99b857d49a..fcbebc795f3 100644 --- a/mozilla/security/nss/lib/ssl/ssl3con.c +++ b/mozilla/security/nss/lib/ssl/ssl3con.c @@ -39,7 +39,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: ssl3con.c,v 1.120 2009-11-07 18:23:05 wtc%google.com Exp $ */ +/* $Id: ssl3con.c,v 1.121 2009-11-12 05:08:27 wtc%google.com Exp $ */ #include "cert.h" #include "ssl.h" @@ -64,6 +64,10 @@ #include #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