diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-05-02 12:16:01 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-05-02 12:16:01 +0000 |
| commit | 82271cee5b6369c263213845f8a81be40d5d5585 (patch) | |
| tree | 43a5b74770b864de29034a7954b98703b103b920 /ssl/ssl.h | |
| parent | 22a415478fa196d08a33a3be3f2e20a49b2ef43a (diff) | |
| download | openssl-82271cee5b6369c263213845f8a81be40d5d5585.tar.gz | |
In Message-ID: <003201bfb332$14a07520$0801a8c0@janm.transactionsite.com>,
"Jan Mikkelsen" <janm@transactionsite.com> correctly states that the
OpenSSL header files have #include's and extern "C"'s in an incorrect
order. Thusly fixed.
Diffstat (limited to 'ssl/ssl.h')
| -rw-r--r-- | ssl/ssl.h | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -59,12 +59,12 @@ #ifndef HEADER_SSL_H #define HEADER_SSL_H +#include <openssl/safestack.h> + #ifdef __cplusplus extern "C" { #endif -#include <openssl/safestack.h> - /* SSLeay version number for ASN.1 encoding of the session information */ /* Version 0 - initial version * Version 1 - added the optional peer certificate @@ -140,6 +140,10 @@ extern "C" { #define SSL_SENT_SHUTDOWN 1 #define SSL_RECEIVED_SHUTDOWN 2 +#ifdef __cplusplus +} +#endif + #include <openssl/crypto.h> #include <openssl/lhash.h> #include <openssl/buffer.h> @@ -147,6 +151,10 @@ extern "C" { #include <openssl/pem.h> #include <openssl/x509.h> +#ifdef __cplusplus +extern "C" { +#endif + #if (defined(NO_RSA) || defined(NO_MD5)) && !defined(NO_SSL2) #define NO_SSL2 #endif @@ -655,11 +663,19 @@ struct ssl_st * SSLv3/TLS rollback check */ }; +#ifdef __cplusplus +} +#endif + #include <openssl/ssl2.h> #include <openssl/ssl3.h> #include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */ #include <openssl/ssl23.h> +#ifdef __cplusplus +extern "C" { +#endif + /* compatibility */ #define SSL_set_app_data(s,arg) (SSL_set_ex_data(s,0,(char *)arg)) #define SSL_get_app_data(s) (SSL_get_ex_data(s,0)) |