From: Bodo Möller Date: Tue, 13 Nov 2001 10:19:54 +0000 (+0000) Subject: fix warning (due to an error during manual conflict resolution) X-Git-Tag: OpenSSL-engine-0_9_6c~32 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=95c0f198a78681cc7a81e8940e62d85e8cbcaec7;p=oweals%2Fopenssl.git fix warning (due to an error during manual conflict resolution) --- diff --git a/crypto/crypto.h b/crypto/crypto.h index 52694ebffa..208ce5f7c1 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -123,7 +123,6 @@ extern "C" { #define CRYPTO_LOCK_MALLOC2 26 #define CRYPTO_LOCK_DSO 27 #define CRYPTO_LOCK_DYNLOCK 28 -#define CRYPTO_NUM_LOCKS 29 #define CRYPTO_LOCK_ENGINE 29 #define CRYPTO_NUM_LOCKS 30