summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
authorjsing <>2014-05-22 17:43:52 +0000
committerjsing <>2014-05-22 17:43:52 +0000
commit44969861a5fe3788fcc9114e6b407a669e709ad0 (patch)
tree6484c6b39bca5e864afb2f808f3b41cb9668da42 /src/lib/libssl/ssl.h
parent5ac4fd0eaaac32772c817578ee9a2c662fa8f630 (diff)
downloadopenbsd-44969861a5fe3788fcc9114e6b407a669e709ad0.tar.gz
openbsd-44969861a5fe3788fcc9114e6b407a669e709ad0.tar.bz2
openbsd-44969861a5fe3788fcc9114e6b407a669e709ad0.zip
There are two actual uses of e_os2.h in libssl - an OPENSSL_GLOBAL (an
empty define) and an OPENSSL_EXTERN (which is defined as, well... extern). The use of OPENSSL_EXTERN is already inconsistent since the lines above and below just use plain old "extern". Expand the two uses of these macros and stop including e_os2.h in libssl. ok miod@
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r--src/lib/libssl/ssl.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index dc56abaa99..98c7cfaa38 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -143,8 +143,6 @@
143#ifndef HEADER_SSL_H 143#ifndef HEADER_SSL_H
144#define HEADER_SSL_H 144#define HEADER_SSL_H
145 145
146#include <openssl/e_os2.h>
147
148#ifndef OPENSSL_NO_COMP 146#ifndef OPENSSL_NO_COMP
149#include <openssl/comp.h> 147#include <openssl/comp.h>
150#endif 148#endif