[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-449-g07f0c95

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  07f0c956c81873d7ab20a8554b96224f71f09084 (commit)
       via  efe013e51343041062b2f4e1ca43757c8ddd179e (commit)
      from  692120de6b6fc2a6970cda14424188487c405cb9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07f0c956c81873d7ab20a8554b96224f71f09084
commit 07f0c956c81873d7ab20a8554b96224f71f09084
Merge: 692120d efe013e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 13:32:20 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 8 13:32:20 2014 -0500

    Merge topic 'update-curl' into next
    
    efe013e5 curl: Skip sanity check that triggers Clang warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efe013e51343041062b2f4e1ca43757c8ddd179e
commit efe013e51343041062b2f4e1ca43757c8ddd179e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 13:30:02 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 8 13:30:10 2014 -0500

    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.

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 */
 

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmcurl/include/curl/curl.h |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake