diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-27 20:44:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-27 20:46:23 (GMT) |
| commit | e643e0259df0736022d484c68a6781c3a380dd06 (patch) | |
| tree | 418389d17651ae40b59f4fb5cd6383c91cc4c95d /Utilities/cmcurl/Platforms | |
| parent | 5dd8c01429da90a7417b72f17e784cc98f70f57c (diff) | |
| download | CMake-e643e0259df0736022d484c68a6781c3a380dd06.zip CMake-e643e0259df0736022d484c68a6781c3a380dd06.tar.gz CMake-e643e0259df0736022d484c68a6781c3a380dd06.tar.bz2 | |
cmcurl: Backport curl bug 1192 fix (#14250)
LLVM headers define strlcat as a macro rather than as a function.
See upstream Curl issue:
http://curl.haxx.se/bug/view.cgi?id=1192
It was addressed by removing use of strlcat altogether. Port the
upstream fix to CMake's curl.
Diffstat (limited to 'Utilities/cmcurl/Platforms')
| -rw-r--r-- | Utilities/cmcurl/Platforms/WindowsCache.cmake | 1 | ||||
| -rw-r--r-- | Utilities/cmcurl/Platforms/config-aix.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/Utilities/cmcurl/Platforms/WindowsCache.cmake b/Utilities/cmcurl/Platforms/WindowsCache.cmake index b4515ce..57ab30b 100644 --- a/Utilities/cmcurl/Platforms/WindowsCache.cmake +++ b/Utilities/cmcurl/Platforms/WindowsCache.cmake @@ -76,7 +76,6 @@ IF(NOT UNIX) SET(HAVE_SETVBUF 0) SET(HAVE_SIGSETJMP 0) SET(HAVE_GETPASS_R 0) - SET(HAVE_STRLCAT 0) SET(HAVE_GETPWUID 0) SET(HAVE_GETEUID 0) SET(HAVE_UTIME 1) diff --git a/Utilities/cmcurl/Platforms/config-aix.h b/Utilities/cmcurl/Platforms/config-aix.h index 86d1093..c98b10f 100644 --- a/Utilities/cmcurl/Platforms/config-aix.h +++ b/Utilities/cmcurl/Platforms/config-aix.h @@ -343,9 +343,6 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the `strlcat' function. */ -/* #undef HAVE_STRLCAT */ - /* Define to 1 if you have the `strlcpy' function. */ /* #undef HAVE_STRLCPY */ |