Cope with the removal of openssl/symhacks.h

13 files changed, 0 insertions, 23 deletions

diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h
index 220a0c8c637..c48ce3cb929 100644
--- a/lib/libcrypto/asn1/asn1.h
+++ b/lib/libcrypto/asn1/asn1.h
@@ -67,8 +67,6 @@
 #include <openssl/stack.h>
 #include <openssl/safestack.h>
 
-#include <openssl/symhacks.h>
-
 #include <openssl/ossl_typ.h>
 #ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h
index f92fc5182d9..76bc5958c0b 100644
--- a/lib/libcrypto/crypto.h
+++ b/lib/libcrypto/crypto.h
@@ -134,10 +134,6 @@
 #include <openssl/ebcdic.h>
 #endif
 
-/* Resolve problems on some operating systems with symbol names that clash
-   one way or another */
-#include <openssl/symhacks.h>
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libcrypto/des/des_old.h b/lib/libcrypto/des/des_old.h
index 2b2c3723549..d75a6df2e85 100644
--- a/lib/libcrypto/des/des_old.h
+++ b/lib/libcrypto/des/des_old.h
@@ -105,8 +105,6 @@
 #error <openssl/des_old.h> replaces <kerberos/des.h>.
 #endif
 
-#include <openssl/symhacks.h>
-
 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
 # undef OPENSSL_EXTERN
 # define OPENSSL_EXTERN OPENSSL_EXPORT
diff --git a/lib/libcrypto/ec/ec.h b/lib/libcrypto/ec/ec.h
index dfe8710d330..86f8c6820d9 100644
--- a/lib/libcrypto/ec/ec.h
+++ b/lib/libcrypto/ec/ec.h
@@ -83,7 +83,6 @@
 #endif
 
 #include <openssl/asn1.h>
-#include <openssl/symhacks.h>
 #ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
 #endif
diff --git a/lib/libcrypto/ec/ecp_oct.c b/lib/libcrypto/ec/ecp_oct.c
index 374a0ee731a..a06abbc8cd6 100644
--- a/lib/libcrypto/ec/ecp_oct.c
+++ b/lib/libcrypto/ec/ecp_oct.c
@@ -63,7 +63,6 @@
  */
 
 #include <openssl/err.h>
-#include <openssl/symhacks.h>
 
 #include "ec_lcl.h"
 
diff --git a/lib/libcrypto/ec/ecp_smpl.c b/lib/libcrypto/ec/ecp_smpl.c
index 7cbb321f9aa..cd05fd12514 100644
--- a/lib/libcrypto/ec/ecp_smpl.c
+++ b/lib/libcrypto/ec/ecp_smpl.c
@@ -63,7 +63,6 @@
  */
 
 #include <openssl/err.h>
-#include <openssl/symhacks.h>
 
 #ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
diff --git a/lib/libcrypto/engine/engine.h b/lib/libcrypto/engine/engine.h
index 05e13578bd7..e9478dd12fb 100644
--- a/lib/libcrypto/engine/engine.h
+++ b/lib/libcrypto/engine/engine.h
@@ -93,7 +93,6 @@
 #endif
 
 #include <openssl/ossl_typ.h>
-#include <openssl/symhacks.h>
 
 #include <openssl/x509.h>
 
diff --git a/lib/libcrypto/evp/evp.h b/lib/libcrypto/evp/evp.h
index faeb3c24e61..ba8440aad95 100644
--- a/lib/libcrypto/evp/evp.h
+++ b/lib/libcrypto/evp/evp.h
@@ -69,8 +69,6 @@
 
 #include <openssl/ossl_typ.h>
 
-#include <openssl/symhacks.h>
-
 #ifndef OPENSSL_NO_BIO
 #include <openssl/bio.h>
 #endif
diff --git a/lib/libcrypto/pem/pem.h b/lib/libcrypto/pem/pem.h
index 8a6ababe3a8..e27440330c5 100644
--- a/lib/libcrypto/pem/pem.h
+++ b/lib/libcrypto/pem/pem.h
@@ -454,8 +454,6 @@ void	PEM_proc_type(char *buf, int type);
 void	PEM_dek_info(char *buf, const char *type, int len, char *str);
 
 
-#include <openssl/symhacks.h>
-
 DECLARE_PEM_rw(X509, X509)
 
 DECLARE_PEM_rw(X509_AUX, X509)
diff --git a/lib/libcrypto/pkcs7/pkcs7.h b/lib/libcrypto/pkcs7/pkcs7.h
index e4d443193c4..4476d613742 100644
--- a/lib/libcrypto/pkcs7/pkcs7.h
+++ b/lib/libcrypto/pkcs7/pkcs7.h
@@ -63,7 +63,6 @@
 #include <openssl/bio.h>
 #include <openssl/e_os2.h>
 
-#include <openssl/symhacks.h>
 #include <openssl/ossl_typ.h>
 
 #ifdef  __cplusplus
diff --git a/lib/libcrypto/ts/ts.h b/lib/libcrypto/ts/ts.h
index 190e8a1bf2b..88e0111453f 100644
--- a/lib/libcrypto/ts/ts.h
+++ b/lib/libcrypto/ts/ts.h
@@ -60,7 +60,6 @@
 #define HEADER_TS_H
 
 #include <openssl/opensslconf.h>
-#include <openssl/symhacks.h>
 #ifndef OPENSSL_NO_BUFFER
 #include <openssl/buffer.h>
 #endif
@@ -86,9 +85,6 @@
 #include <openssl/dh.h>
 #endif
 
-#include <openssl/evp.h>
-
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h
index 092dd7450d3..121847b2449 100644
--- a/lib/libcrypto/x509/x509.h
+++ b/lib/libcrypto/x509/x509.h
@@ -65,7 +65,6 @@
 #define HEADER_X509_H
 
 #include <openssl/e_os2.h>
-#include <openssl/symhacks.h>
 #ifndef OPENSSL_NO_BUFFER
 #include <openssl/buffer.h>
 #endif
diff --git a/lib/libcrypto/x509/x509_vfy.h b/lib/libcrypto/x509/x509_vfy.h
index fe09b30aaa6..1766e3cd219 100644
--- a/lib/libcrypto/x509/x509_vfy.h
+++ b/lib/libcrypto/x509/x509_vfy.h
@@ -71,7 +71,6 @@
 #endif
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
-#include <openssl/symhacks.h>
 
 #ifdef  __cplusplus
 extern "C" {