From 7cd2d10d005ebf8d41c6271db9c553a501c90896 Mon Sep 17 00:00:00 2001 From: Jordan Lee Date: Tue, 29 Mar 2016 19:02:26 +0000 Subject: [PATCH] crypto.h and crypto-utils.h can't use #pragma once, it breaks our name munging in crypto-test-ref.h --- libtransmission/crypto-test-ref.h | 7 +++---- libtransmission/crypto-test.c | 2 ++ libtransmission/crypto-utils.h | 4 +++- libtransmission/crypto.h | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libtransmission/crypto-test-ref.h b/libtransmission/crypto-test-ref.h index 94cc040cb..843f3fbc3 100644 --- a/libtransmission/crypto-test-ref.h +++ b/libtransmission/crypto-test-ref.h @@ -7,7 +7,8 @@ * $Id$ */ -#pragma once +#ifndef TR_CRYPTO_TEST_REF_H +#define TR_CRYPTO_TEST_REF_H /* #define CRYPTO_REFERENCE_CHECK */ @@ -168,8 +169,6 @@ #define tr_sha1_to_hex_ tr_sha1_to_hex #define tr_hex_to_sha1_ tr_hex_to_sha1 -#include "crypto.h" -#include "crypto-utils.h" - #endif /* CRYPTO_REFERENCE_CHECK */ +#endif /* TR_CRYPTO_TEST_REF_H */ diff --git a/libtransmission/crypto-test.c b/libtransmission/crypto-test.c index d43a1b25d..e2a145e56 100644 --- a/libtransmission/crypto-test.c +++ b/libtransmission/crypto-test.c @@ -10,6 +10,8 @@ #include #include "transmission.h" +#include "crypto.h" +#include "crypto-utils.h" #include "libtransmission-test.h" diff --git a/libtransmission/crypto-utils.h b/libtransmission/crypto-utils.h index c12f90a77..d4dc9ecb3 100644 --- a/libtransmission/crypto-utils.h +++ b/libtransmission/crypto-utils.h @@ -7,7 +7,8 @@ * $Id$ */ -#pragma once +#ifndef TR_CRYPTO_UTILS_H +#define TR_CRYPTO_UTILS_H #include #include @@ -221,3 +222,4 @@ tr_hex_to_sha1 (uint8_t * sha1, } #endif +#endif /* TR_CRYPTO_UTILS_H */ diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h index e31bce126..ca54a42fe 100644 --- a/libtransmission/crypto.h +++ b/libtransmission/crypto.h @@ -11,7 +11,8 @@ #error only libtransmission should #include this header. #endif -#pragma once +#ifndef TR_ENCRYPTION_H +#define TR_ENCRYPTION_H #include @@ -84,3 +85,4 @@ bool tr_cryptoSecretKeySha1 (const tr_crypto * crypto, /* @} */ +#endif