From aeae22cbb25f018728177a14c10e20dfd511e461 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 13 Sep 2012 01:11:06 +0200 Subject: [PATCH] openssl: revert empty_OPENSSL_cpuid_setup.patch --- deps/openssl/openssl/crypto/cryptlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/openssl/openssl/crypto/cryptlib.c b/deps/openssl/openssl/crypto/cryptlib.c index 0f05743df0e..766ea8cac73 100644 --- a/deps/openssl/openssl/crypto/cryptlib.c +++ b/deps/openssl/openssl/crypto/cryptlib.c @@ -718,7 +718,7 @@ void OPENSSL_cpuid_setup(void) unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; } #endif int OPENSSL_NONPIC_relocated = 0; -#if !defined(OPENSSL_CPUID_SETUP) +#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) void OPENSSL_cpuid_setup(void) {} #endif