diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-09-13 01:11:06 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-12-20 15:02:57 +0100 |
| commit | aeae22cbb25f018728177a14c10e20dfd511e461 (patch) | |
| tree | f9215ebbb87d09d7bdbdcb19834e628c65b20487 | |
| parent | 2e6180a62a450a89d6dda2df46ce3ed496414e43 (diff) | |
| download | node-aeae22cbb25f018728177a14c10e20dfd511e461.tar.gz | |
openssl: revert empty_OPENSSL_cpuid_setup.patch
| -rw-r--r-- | deps/openssl/openssl/crypto/cryptlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/openssl/openssl/crypto/cryptlib.c b/deps/openssl/openssl/crypto/cryptlib.c index 0f05743df..766ea8cac 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 |