diff options
| author | wtc%google.com <devnull@localhost> | 2009-11-12 05:08:27 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-11-12 05:08:27 +0000 |
| commit | b8f8bb818fb5532ab11b17717598969b5a4236d9 (patch) | |
| tree | 2b642cff22b6793ab6cff6a94bcb660cf721609e | |
| parent | b892b212b8ef71b9279810fc001ec80d2380df45 (diff) | |
| download | nss-hg-b8f8bb818fb5532ab11b17717598969b5a4236d9.tar.gz | |
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.
| -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 |