diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-12-16 22:53:10 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-12-16 23:00:51 +0100 |
| commit | 82ffd6035373b781ab8cfc990e49465f8d4520cd (patch) | |
| tree | 694f4c29d7f77dc05fa0840b529969c2c2c73d66 | |
| parent | 3ab45a9876db2bc1c612f69c2133b3161b4a7c37 (diff) | |
| download | curl-bagder/HAVE_ENGINE_LOAD_BUILTIN_ENGINES.tar.gz | |
define: remove HAVE_ENGINE_LOAD_BUILTIN_ENGINES, not used anymorebagder/HAVE_ENGINE_LOAD_BUILTIN_ENGINES
Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/87b9337c8f76c21c57b204e88b68c6ecf3bd1ac0#commitcomment-36447951
Closes #4725
| -rw-r--r-- | lib/Makefile.m32 | 4 | ||||
| -rw-r--r-- | lib/config-plan9.h | 1 | ||||
| -rw-r--r-- | lib/config-symbian.h | 3 | ||||
| -rw-r--r-- | lib/config-tpf.h | 4 | ||||
| -rw-r--r-- | lib/config-vxworks.h | 3 | ||||
| -rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
| -rw-r--r-- | packages/vms/config_h.com | 22 |
7 files changed, 2 insertions, 38 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index ae88f4dce..b6ef0a5cb 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1999 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -271,7 +271,7 @@ ifdef SSL endif INCLUDES += -I"$(OPENSSL_INCLUDE)" CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \ - -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 + -DOPENSSL_NO_KRB5 DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) ifdef SRP ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h" diff --git a/lib/config-plan9.h b/lib/config-plan9.h index 64bfbdea0..4063d4bbd 100644 --- a/lib/config-plan9.h +++ b/lib/config-plan9.h @@ -102,7 +102,6 @@ #define HAVE_BASENAME 1 #define HAVE_BOOL_T 1 #define HAVE_CRYPTO_CLEANUP_ALL_EX_DATA 1 -#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1 #define HAVE_ERRNO_H 1 #define HAVE_FCNTL 1 #define HAVE_FCNTL_H 1 diff --git a/lib/config-symbian.h b/lib/config-symbian.h index cb2e96d5d..c01e1bfab 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -128,9 +128,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 -/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */ -/*#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1*/ - /* Define to 1 if you have the <errno.h> header file. */ #define HAVE_ERRNO_H 1 diff --git a/lib/config-tpf.h b/lib/config-tpf.h index f0c095bb0..85b634f9d 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -119,10 +119,6 @@ /* #undef HAVE_DES_H */ #define HAVE_DES_H 1 -/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */ -/* #undef HAVE_ENGINE_LOAD_BUILTIN_ENGINES */ -#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1 - /* Define to 1 if you have the <errno.h> header file. */ #define HAVE_ERRNO_H 1 diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index d352578e3..004fd4e80 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -143,9 +143,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 -/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */ -#define HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1 - /* Define to 1 if you have the <errno.h> header file. */ #define HAVE_ERRNO_H 1 diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index d95fe94fd..2c3b6562d 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -148,9 +148,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #cmakedefine HAVE_DLFCN_H 1 -/* Define to 1 if you have the `ENGINE_load_builtin_engines' function. */ -#cmakedefine HAVE_ENGINE_LOAD_BUILTIN_ENGINES 1 - /* Define to 1 if you have the <errno.h> header file. */ #cmakedefine HAVE_ERRNO_H 1 diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com index 967eb40de..9bfb40b95 100644 --- a/packages/vms/config_h.com +++ b/packages/vms/config_h.com @@ -803,28 +803,6 @@ $ write tf "#endif" $ goto cfgh_in_loop1 $ endif $! -$ if key2 .eqs. "HAVE_ENGINE_LOAD_BUILTIN_ENGINES" -$ then -$ if f$search("''ssl_header_dir'engine.h") .nes. "" -$ then -$ search_key = key2 - "HAVE_" -$ define/user sys$output nl: -$ define/user sys$error nl: -$ search/output=nl: 'ssl_header_dir'engine.h 'search_key' -$ if '$severity' .eq. 1 -$ then -$ write tf "#ifndef ''key2'" -$ write tf "#define ''key2' 1" -$ write tf "#endif" -$ else -$ write tf "/* #undef ''key2' */" -$ endif -$ else -$ write tf "/* #undef ''key2' */" -$ endif -$ goto cfgh_in_loop1 -$ endif -$! $ if key2b .eqs. "RAND" .and. key2c .nes. "" .and. key2d .eqs. "" $ then $ if (key2c .eqs. "EGD") .or. - |