From: Richard Levitte <levitte@openssl.org>
Date: Mon, 14 Oct 2002 09:53:46 +0000 (+0000)
Subject: makedepend complains when a header file is included more than once in
X-Git-Tag: OpenSSL_0_9_7-beta4~117
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f6733ae577435d4e82b9f9438304dadb73c8ac41;p=oweals%2Fopenssl.git

makedepend complains when a header file is included more than once in
the same source file.
---

diff --git a/apps/passwd.c b/apps/passwd.c
index ad8e7b0349..0c2cf62e8b 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -19,7 +19,6 @@
 # include <openssl/des.h>
 #endif
 #ifndef NO_MD5CRYPT_1
-# include <openssl/evp.h>
 # include <openssl/md5.h>
 #endif
 
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 912e32006b..f86474dd25 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -63,7 +63,6 @@
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 
-#include "apps.h"
 #define PROG pkcs8_main
 
 int MAIN(int, char **);
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index dbb30f4f22..28b5b008f8 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -70,7 +70,6 @@
 
 #include <openssl/symhacks.h>
 
-#include <openssl/e_os2.h>
 #include <openssl/ossl_typ.h>
 
 #ifdef OPENSSL_BUILD_SHLIBCRYPTO
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 67b1279b99..aa58dab046 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -28,7 +28,6 @@
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
-#include <openssl/err.h>
 #include <openssl/crypto.h>
 
 #include "e_os.h"
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index e9d976f46b..9253ac6d10 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -63,6 +63,7 @@
 #include <openssl/engine.h>
 #include <openssl/dso.h>
 #include <openssl/pem.h>
+#include <openssl/evp.h>
 
 /* This testing gunk is implemented (and explained) lower down. It also assumes
  * the application explicitly calls "ENGINE_load_openssl()" because this is no
@@ -180,7 +181,6 @@ IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
  *        the "init_key" handler is called.
  *    TEST_ENG_OPENSSL_RC4_P_CIPHER - ditto for the "cipher" handler.
  */
-#include <openssl/evp.h>
 #include <openssl/rc4.h>
 #define TEST_RC4_KEY_SIZE		16
 static int test_cipher_nids[] = {NID_rc4,NID_rc4_40};
@@ -265,7 +265,6 @@ static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
 
 #ifdef TEST_ENG_OPENSSL_SHA
 /* Much the same sort of comment as for TEST_ENG_OPENSSL_RC4 */
-#include <openssl/evp.h>
 #include <openssl/sha.h>
 static int test_digest_nids[] = {NID_sha1};
 static int test_digest_nids_number = 1;
diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c
index c156663f0e..81e34bd6ce 100644
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.c
@@ -62,7 +62,6 @@
 #include "cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/err.h>
-#include <openssl/crypto.h>
 
 void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
 			 void *u)
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 7095440d36..b4a6c46d48 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -87,7 +87,6 @@
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 #endif
-#include <openssl/evp.h>
 #include <openssl/e_os2.h>
 #include <openssl/ossl_typ.h>
 
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 94e6fd4f1c..bdeefb2175 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -315,9 +315,7 @@ extern "C" {
 #include <openssl/crypto.h>
 #include <openssl/lhash.h>
 #include <openssl/buffer.h>
-#include <openssl/bio.h>
 #include <openssl/pem.h>
-#include <openssl/x509.h>
 
 #ifdef  __cplusplus
 extern "C" {