[Cmake-commits] CMake branch, next, updated. v3.3.0-2222-gcdaed8a

[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  cdaed8a166e4ea74d1ca9ca3435bb00edbf63bbc (commit)
       via  dcbfac8bc394d307386069c84d6ac7282b88bc8e (commit)
      from  f4ee08f7a1a82f955741bac5d8bf94c484e89f22 (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=cdaed8a166e4ea74d1ca9ca3435bb00edbf63bbc
commit cdaed8a166e4ea74d1ca9ca3435bb00edbf63bbc
Merge: f4ee08f dcbfac8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 14 09:24:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 14 09:24:54 2015 -0400

    Merge topic 'update-curl' into next
    
    dcbfac8b curl: Fix check for gethostbyname_r with 5 arguments


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcbfac8bc394d307386069c84d6ac7282b88bc8e
commit dcbfac8bc394d307386069c84d6ac7282b88bc8e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 14 09:14:55 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 14 09:23:51 2015 -0400

    curl: Fix check for gethostbyname_r with 5 arguments
    
    Fix the check code to pass 5 arguments instead of 6.  This typo was
    introduced in curl 7.39 but was not noticed because the result of
    this check is used only if ENABLE_IPV6 is OFF.

diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c
index 04d5e7e..3c71232 100644
--- a/Utilities/cmcurl/CMake/CurlTests.c
+++ b/Utilities/cmcurl/CMake/CurlTests.c
@@ -139,7 +139,7 @@ int main(void)
   rc = gethostbyname_r(address, &h, &hdata);
 #elif defined(HAVE_GETHOSTBYNAME_R_5) || \
       defined(HAVE_GETHOSTBYNAME_R_5_REENTRANT)
-  rc = gethostbyname_r(address, &h, buffer, 8192, 0, &h_errnop);
+  rc = gethostbyname_r(address, &h, buffer, 8192, &h_errnop);
   (void)hp; /* not used for test */
 #elif defined(HAVE_GETHOSTBYNAME_R_6) || \
       defined(HAVE_GETHOSTBYNAME_R_6_REENTRANT)

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

Summary of changes:
 Utilities/cmcurl/CMake/CurlTests.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake