From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Jan 2018 15:48:35 +0000 (-0500)
Subject: Improve #include structure of pem{,2}.h
X-Git-Tag: OpenSSL_1_1_1-pre1~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5773f7bee4a12774977acba47ad89779c7a89bcd;p=oweals%2Fopenssl.git

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)
---

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