diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-23 10:48:35 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-09 17:49:07 +0100 |
| commit | 5773f7bee4a12774977acba47ad89779c7a89bcd (patch) | |
| tree | 7bc47dc841a460e6d74706461658443030a9ec14 /include | |
| parent | a5d0d6b8fd1645c150e1b276863157bb29f0f598 (diff) | |
Improve #include structure of pem{,2}.h
- pem2.h is empty, so pem.h doesn't need to include it.
- pem2.h once declared ERR_load_PEM_strings(), so it should now
include pemerr.h
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5150)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/pem.h | 1 | ||||
| -rw-r--r-- | include/openssl/pem2.h | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 3b21ab8234..55bcd712e6 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -15,7 +15,6 @@ # include <openssl/safestack.h> # include <openssl/evp.h> # include <openssl/x509.h> -# include <openssl/pem2.h> # include <openssl/pemerr.h> #ifdef __cplusplus diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h index 8a46324af3..bad7ac897f 100644 --- a/include/openssl/pem2.h +++ b/include/openssl/pem2.h @@ -7,10 +7,7 @@ * https://www.openssl.org/source/license.html */ -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} +#ifndef HEADER_PEM2_H +# define HEADER_PEM2_H +# include <openssl/pemerr.h> #endif |