summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-11-08 18:30:02 (GMT)
committerBrad King <brad.king@kitware.com>2014-11-10 15:13:39 (GMT)
commita427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851 (patch)
tree8af6c3244cf083c4c3732ceafd91d163124885f5
parent17b24d552baa2bed05a277e3df11fe81d571a6f3 (diff)
downloadCMake-a427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851.zip
CMake-a427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851.tar.gz
CMake-a427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851.tar.bz2
curl: Skip sanity check that triggers Clang warning
Defining curl APIs as forwarding macros triggers Clang warnings with -Wdisabled-macro-expansion. Skip this sanity check.
-rw-r--r--Utilities/cmcurl/include/curl/curl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Utilities/cmcurl/include/curl/curl.h b/Utilities/cmcurl/include/curl/curl.h
index 2792a96..40d0b81 100644
--- a/Utilities/cmcurl/include/curl/curl.h
+++ b/Utilities/cmcurl/include/curl/curl.h
@@ -2323,6 +2323,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
#include "typecheck-gcc.h"
#else
#if defined(__STDC__) && (__STDC__ >= 1)
+#if 0 /* Triggers clang -Wdisabled-macro-expansion, skip for CMake. */
/* This preprocessor magic that replaces a call with the exact same call is
only done to make sure application authors pass exactly three arguments
to these functions. */
@@ -2330,6 +2331,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
#define curl_easy_getinfo(handle,info,arg) curl_easy_getinfo(handle,info,arg)
#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
+#endif
#endif /* __STDC__ >= 1 */
#endif /* gcc >= 4.3 && !__cplusplus */