summaryrefslogtreecommitdiffstats
path: root/net/third_party/nss/ssl/sslimpl.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/third_party/nss/ssl/sslimpl.h')
-rw-r--r--net/third_party/nss/ssl/sslimpl.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl.h
index 0a7fbcf..6f2316a 100644
--- a/net/third_party/nss/ssl/sslimpl.h
+++ b/net/third_party/nss/ssl/sslimpl.h
@@ -39,7 +39,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
-/* $Id: sslimpl.h,v 1.69 2009/11/07 18:23:06 wtc%google.com Exp $ */
+/* $Id: sslimpl.h,v 1.70 2009/11/21 03:40:49 wtc%google.com Exp $ */
#ifndef __sslimpl_h_
#define __sslimpl_h_
@@ -544,8 +544,9 @@ typedef struct {
SSLDestroy destroy;
void * encodeContext;
void * decodeContext;
- SSLCompressor compress;
- SSLCompressor decompress;
+ SSLCompressor compressor; /* Don't name these fields compress */
+ SSLCompressor decompressor; /* and uncompress because zconf.h */
+ /* may define them as macros. */
SSLDestroy destroyCompressContext;
void * compressContext;
SSLDestroy destroyDecompressContext;