makedepend complains when a header file is included more than once in
the same source file.
This commit is contained in:
parent
2d2ca3aab1
commit
f6733ae577
@ -19,7 +19,6 @@
|
|||||||
# include <openssl/des.h>
|
# include <openssl/des.h>
|
||||||
#endif
|
#endif
|
||||||
#ifndef NO_MD5CRYPT_1
|
#ifndef NO_MD5CRYPT_1
|
||||||
# include <openssl/evp.h>
|
|
||||||
# include <openssl/md5.h>
|
# include <openssl/md5.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -63,7 +63,6 @@
|
|||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/pkcs12.h>
|
#include <openssl/pkcs12.h>
|
||||||
|
|
||||||
#include "apps.h"
|
|
||||||
#define PROG pkcs8_main
|
#define PROG pkcs8_main
|
||||||
|
|
||||||
int MAIN(int, char **);
|
int MAIN(int, char **);
|
||||||
|
@ -70,7 +70,6 @@
|
|||||||
|
|
||||||
#include <openssl/symhacks.h>
|
#include <openssl/symhacks.h>
|
||||||
|
|
||||||
#include <openssl/e_os2.h>
|
|
||||||
#include <openssl/ossl_typ.h>
|
#include <openssl/ossl_typ.h>
|
||||||
|
|
||||||
#ifdef OPENSSL_BUILD_SHLIBCRYPTO
|
#ifdef OPENSSL_BUILD_SHLIBCRYPTO
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
|
|
||||||
#include <openssl/bio.h>
|
#include <openssl/bio.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#include <openssl/err.h>
|
|
||||||
#include <openssl/crypto.h>
|
#include <openssl/crypto.h>
|
||||||
|
|
||||||
#include "e_os.h"
|
#include "e_os.h"
|
||||||
|
@ -63,6 +63,7 @@
|
|||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
#include <openssl/dso.h>
|
#include <openssl/dso.h>
|
||||||
#include <openssl/pem.h>
|
#include <openssl/pem.h>
|
||||||
|
#include <openssl/evp.h>
|
||||||
|
|
||||||
/* This testing gunk is implemented (and explained) lower down. It also assumes
|
/* This testing gunk is implemented (and explained) lower down. It also assumes
|
||||||
* the application explicitly calls "ENGINE_load_openssl()" because this is no
|
* 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.
|
* the "init_key" handler is called.
|
||||||
* TEST_ENG_OPENSSL_RC4_P_CIPHER - ditto for the "cipher" handler.
|
* TEST_ENG_OPENSSL_RC4_P_CIPHER - ditto for the "cipher" handler.
|
||||||
*/
|
*/
|
||||||
#include <openssl/evp.h>
|
|
||||||
#include <openssl/rc4.h>
|
#include <openssl/rc4.h>
|
||||||
#define TEST_RC4_KEY_SIZE 16
|
#define TEST_RC4_KEY_SIZE 16
|
||||||
static int test_cipher_nids[] = {NID_rc4,NID_rc4_40};
|
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
|
#ifdef TEST_ENG_OPENSSL_SHA
|
||||||
/* Much the same sort of comment as for TEST_ENG_OPENSSL_RC4 */
|
/* Much the same sort of comment as for TEST_ENG_OPENSSL_RC4 */
|
||||||
#include <openssl/evp.h>
|
|
||||||
#include <openssl/sha.h>
|
#include <openssl/sha.h>
|
||||||
static int test_digest_nids[] = {NID_sha1};
|
static int test_digest_nids[] = {NID_sha1};
|
||||||
static int test_digest_nids_number = 1;
|
static int test_digest_nids_number = 1;
|
||||||
|
@ -62,7 +62,6 @@
|
|||||||
#include "cryptlib.h"
|
#include "cryptlib.h"
|
||||||
#include <openssl/buffer.h>
|
#include <openssl/buffer.h>
|
||||||
#include <openssl/err.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 ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
|
||||||
void *u)
|
void *u)
|
||||||
|
@ -87,7 +87,6 @@
|
|||||||
#ifndef OPENSSL_NO_SHA
|
#ifndef OPENSSL_NO_SHA
|
||||||
#include <openssl/sha.h>
|
#include <openssl/sha.h>
|
||||||
#endif
|
#endif
|
||||||
#include <openssl/evp.h>
|
|
||||||
#include <openssl/e_os2.h>
|
#include <openssl/e_os2.h>
|
||||||
#include <openssl/ossl_typ.h>
|
#include <openssl/ossl_typ.h>
|
||||||
|
|
||||||
|
@ -315,9 +315,7 @@ extern "C" {
|
|||||||
#include <openssl/crypto.h>
|
#include <openssl/crypto.h>
|
||||||
#include <openssl/lhash.h>
|
#include <openssl/lhash.h>
|
||||||
#include <openssl/buffer.h>
|
#include <openssl/buffer.h>
|
||||||
#include <openssl/bio.h>
|
|
||||||
#include <openssl/pem.h>
|
#include <openssl/pem.h>
|
||||||
#include <openssl/x509.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user