diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2023-05-16 23:40:42 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2023-05-17 08:03:10 +0200 |
| commit | f446258f0269a62289cca0210157cb8558d0edc3 (patch) | |
| tree | d4a47569cf235c7dae3f33de00738fcde7fb08df | |
| parent | ec91b9c08f26cf054878a0bda6d0f1c05175e0f8 (diff) | |
| download | curl-f446258f0269a62289cca0210157cb8558d0edc3.tar.gz | |
hostip: include easy_lock.h before using GLOBAL_INIT_IS_THREADSAFE
Since that header file is the only place that define can be defined.
Reported-by: Marc Deslauriers
Follow-up to 13718030ad4b3209
Closes #11121
| -rw-r--r-- | lib/hostip.c | 10 | ||||
| -rw-r--r-- | lib/hostip.h | 9 |
2 files changed, 4 insertions, 15 deletions
diff --git a/lib/hostip.c b/lib/hostip.c index 615f36c16..4ff348436 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -70,6 +70,8 @@ #include <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif +#include "easy_lock.h" + #if defined(CURLRES_SYNCH) && \ defined(HAVE_ALARM) && \ defined(SIGALRM) && \ @@ -79,10 +81,6 @@ #define USE_ALARM_TIMEOUT #endif -#ifdef USE_ALARM_TIMEOUT -#include "easy_lock.h" -#endif - #define MAX_HOSTCACHE_LEN (255 + 7) /* max FQDN + colon + port number + zero */ #define MAX_DNS_CACHE_SIZE 29999 @@ -289,8 +287,8 @@ void Curl_hostcache_prune(struct Curl_easy *data) /* Beware this is a global and unique instance. This is used to store the return address that we can jump back to from inside a signal handler. This is not thread-safe stuff. */ -sigjmp_buf curl_jmpenv; -curl_simple_lock curl_jmpenv_lock; +static sigjmp_buf curl_jmpenv; +static curl_simple_lock curl_jmpenv_lock; #endif /* lookup address, returns entry if found and not stale */ diff --git a/lib/hostip.h b/lib/hostip.h index 4b5481f65..0dd19e87c 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -186,15 +186,6 @@ Curl_cache_addr(struct Curl_easy *data, struct Curl_addrinfo *addr, #define CURL_INADDR_NONE INADDR_NONE #endif -#ifdef HAVE_SIGSETJMP -/* Forward-declaration of variable defined in hostip.c. Beware this - * is a global and unique instance. This is used to store the return - * address that we can jump back to from inside a signal handler. - * This is not thread-safe stuff. - */ -extern sigjmp_buf curl_jmpenv; -#endif - /* * Function provided by the resolver backend to set DNS servers to use. */ |