Commit 5773f7be authored by Nick Mathewson's avatar Nick Mathewson Committed by Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5150)
parent a5d0d6b8

include/openssl/pem.h

+0 −1
Original line number Diff line number Diff line
@@ -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

include/openssl/pem2.h

+3 −6
Original line number Diff line number Diff line
@@ -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