diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-04-13 23:46:18 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-04-14 08:12:27 +0200 |
| commit | 878214df44a41eef49b65039ab0cdfdbf847a5fe (patch) | |
| tree | 1babc575b299757800890bdc7454490468cccbc3 /src/tool_util.c | |
| parent | 7fa1578471697eac9726261c3dcd06ded994aa21 (diff) | |
tool: do not declare functions with Curl_ prefix
To avoid collision risks with private libcurl symbols when linked with
static versions (or just versions not hiding internal symbols).
Reported-by: hydra3333 on github
Fixes #5219
Closes #5234
Diffstat (limited to 'src/tool_util.c')
| -rw-r--r-- | src/tool_util.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tool_util.c b/src/tool_util.c index 8bbfae03e..3ca13e7cb 100644 --- a/src/tool_util.c +++ b/src/tool_util.c @@ -28,19 +28,19 @@ #if defined(WIN32) && !defined(MSDOS) /* set in win32_init() */ -extern LARGE_INTEGER Curl_freq; -extern bool Curl_isVistaOrGreater; +extern LARGE_INTEGER tool_freq; +extern bool tool_isVistaOrGreater; /* In case of bug fix this function has a counterpart in timeval.c */ struct timeval tvnow(void) { struct timeval now; - if(Curl_isVistaOrGreater) { /* QPC timer might have issues pre-Vista */ + if(tool_isVistaOrGreater) { /* QPC timer might have issues pre-Vista */ LARGE_INTEGER count; QueryPerformanceCounter(&count); - now.tv_sec = (long)(count.QuadPart / Curl_freq.QuadPart); - now.tv_usec = (long)((count.QuadPart % Curl_freq.QuadPart) * 1000000 / - Curl_freq.QuadPart); + now.tv_sec = (long)(count.QuadPart / tool_freq.QuadPart); + now.tv_usec = (long)((count.QuadPart % tool_freq.QuadPart) * 1000000 / + tool_freq.QuadPart); } else { /* Disable /analyze warning that GetTickCount64 is preferred */ |