diff options
| author | eska | 2016-05-12 17:06:34 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2016-05-12 19:35:49 +0200 |
| commit | b8d8ec09eefa77b20a8dc7678f506688ecb726fe (patch) | |
| tree | 962569e270a5b308adb7315927d8e8cf1d1977f1 | |
| parent | f120514402e0e92d0106bdb2369a59e65ebcb694 (diff) | |
| download | godot-b8d8ec09eefa77b20a8dc7678f506688ecb726fe.tar.gz godot-b8d8ec09eefa77b20a8dc7678f506688ecb726fe.tar.zst godot-b8d8ec09eefa77b20a8dc7678f506688ecb726fe.zip | |
Remove nocpuid.c from builtin OpenSSL
Since opensslconf.h no longer defines OPENSSL_CPUID_OBJ, OpenSSL defines
OPENSSL_cpuid_setup itself (with the same empty definition)
(cherry picked from commit 2392824dbab773b365dc77b8a75c1b75f42b93d8)
| -rw-r--r-- | drivers/builtin_openssl2/SCsub | 1 | ||||
| -rw-r--r-- | drivers/builtin_openssl2/nocpuid.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index 395dd21ee..06d6b07c1 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -2,7 +2,6 @@ Import('env') Import('env_ssl') openssl_sources = [ -"nocpuid.c", "ssl/t1_lib.c", "ssl/t1_ext.c", "ssl/s3_srvr.c", diff --git a/drivers/builtin_openssl2/nocpuid.c b/drivers/builtin_openssl2/nocpuid.c deleted file mode 100644 index 88246067b..000000000 --- a/drivers/builtin_openssl2/nocpuid.c +++ /dev/null @@ -1,7 +0,0 @@ - -#include "openssl/crypto.h" - - -void OPENSSL_cpuid_setup() { - -} |