From: FdaSilvaYY <fdasilvayy@gmail.com>
Date: Sat, 20 Aug 2016 16:47:55 +0000 (+0200)
Subject: Duplicate includes
X-Git-Tag: OpenSSL_1_1_0~108
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bf932fbd4a2385496fa5e9363bf9280fc6fba0ad;p=oweals%2Fopenssl.git

Duplicate includes

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1475)
---

diff --git a/apps/apps.h b/apps/apps.h
index fc7330537e..85b65191bd 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -25,7 +25,6 @@
 # include <openssl/txt_db.h>
 # include <openssl/engine.h>
 # include <openssl/ocsp.h>
-# include <openssl/ossl_typ.h>
 # include <signal.h>
 
 # if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 8aa968dbc5..80bb24eabb 100644
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -34,7 +34,6 @@
 # endif
 
 # include <openssl/sha.h>
-# include <openssl/ossl_typ.h>
 
 #ifdef  __cplusplus
 extern "C" {