summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_locl.h
diff options
context:
space:
mode:
authorLutz Jänicke <jaenicke@openssl.org>2009-01-05 14:43:05 +0000
committerLutz Jänicke <jaenicke@openssl.org>2009-01-05 14:43:05 +0000
commitfceac0bc74ad0a1c2d93f49d619edbc2d948dddc (patch)
tree0b2844ab243a7345856e08f8eee6a8c8a770a946 /ssl/ssl_locl.h
parent792bbc2374b4ea2d1b722ecdc1ff74417219b3ae (diff)
Fix compilation with -no-comp by adding some more #ifndef OPENSSL_NO_COMP
Some #include statements were not properly protected. This will go unnoted on most systems as openssl/comp.h tends to be installed as a system header file by default but may become visible when cross compiling.
Diffstat (limited to 'ssl/ssl_locl.h')
-rw-r--r--ssl/ssl_locl.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 2e6e98fc32..039ee6b28e 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -150,7 +150,9 @@
#include "e_os.h"
#include <openssl/buffer.h>
+#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
+#endif
#include <openssl/bio.h>
#include <openssl/stack.h>
#ifndef OPENSSL_NO_RSA
@@ -554,6 +556,7 @@ typedef struct ssl3_enc_method
int (*alert_value)(int);
} SSL3_ENC_METHOD;
+#ifndef OPENSSL_NO_COMP
/* Used for holding the relevant compression methods loaded into SSL_CTX */
typedef struct ssl3_comp_st
{
@@ -561,6 +564,7 @@ typedef struct ssl3_comp_st
char *name; /* Text name used for the compression type */
COMP_METHOD *method; /* The method :-) */
} SSL3_COMP;
+#endif
#ifndef OPENSSL_NO_BUF_FREELISTS
typedef struct ssl3_buf_freelist_st