The branch master has been updated
via bf932fbd4a2385496fa5e9363bf9280fc6fba0ad (commit)
from a73be798ced572a988d455d961a2387f6eccb549 (commit)
- Log -----------------------------------------------------------------
commit bf932fbd4a2385496fa5e9363bf9280fc6fba0ad
Author: FdaSilvaYY <fdasilv...@gmail.com>
Date: Sat Aug 20 18:47:55 2016 +0200
Duplicate includes
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Rich Salz <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1475)
-----------------------------------------------------------------------
Summary of changes:
apps/apps.h | 1 -
include/openssl/x509.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/apps/apps.h b/apps/apps.h
index fc73305..85b6519 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 8aa968d..80bb24e 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" {
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
