summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-06-10 15:03:28 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-06-10 15:34:38 +0300
commit50e239a93794b2fa1a57105f6f8f093d2e0a8d43 (patch)
tree5de3aae60825d7d8a59507d0ea939c2bc0ea79d4
parent774d32038f60b672ba37daf9ce71e73009a2eed9 (diff)
downloadqtlocation-mapboxgl-50e239a93794b2fa1a57105f6f8f093d2e0a8d43.tar.gz
[core] Renamed to avoid collision with libcurl
Rename curlx_sltosi to mbgl_curlx_sltosi to avoid collision when liking with libcurl statically.
-rw-r--r--src/parsedate/parsedate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parsedate/parsedate.cpp b/src/parsedate/parsedate.cpp
index 3697693f9d..194b83780b 100644
--- a/src/parsedate/parsedate.cpp
+++ b/src/parsedate/parsedate.cpp
@@ -206,7 +206,7 @@ int strcasecompare(const char *first, const char *second)
** signed long to signed int
*/
-int curlx_sltosi(long slnum)
+int mbgl_curlx_sltosi(long slnum)
{
return slnum > INT_MAX ? INT_MAX : slnum < INT_MIN ? INT_MIN : (int)slnum;
}
@@ -545,7 +545,7 @@ static int parsedate(const char *date, time_t *output)
return PARSEDATE_FAIL;
#endif
- val = curlx_sltosi(lval);
+ val = mbgl_curlx_sltosi(lval);
if((tzoff == -1) &&
((end - date) == 4) &&