[Cmake-commits] CMake branch, next, updated. v3.0.0-4281-g36d8b35

[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  36d8b35b267b4fa11d16f53b8f0c088ced6500d5 (commit)
       via  a94565ab204030537011516b63640df3feee0cf1 (commit)
      from  16b94d3aed1dfb26279c1b5f445d7e4314e4bfea (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=36d8b35b267b4fa11d16f53b8f0c088ced6500d5
commit 36d8b35b267b4fa11d16f53b8f0c088ced6500d5
Merge: 16b94d3 a94565a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 16 12:50:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 16 12:50:09 2014 -0400

    Merge topic 'compile-with-cray' into next
    
    a94565ab cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a94565ab204030537011516b63640df3feee0cf1
commit a94565ab204030537011516b63640df3feee0cf1
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Jul 16 09:04:42 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 16 12:49:45 2014 -0400

    cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)
    
    The error is caused by a workaround for UNICOS.  The workaround
    incorrectly uses the _CRAYC macro to determine if building for
    UNICOS.  This macro will always be defined for the Cray C and
    C++ compiler regardless of the target platform, even when
    building for Linux.  The correct macro should be _CRAY, which as
    per Cray documentation is only defined for UNICOS targeted
    builds.

diff --git a/Utilities/cmcurl/hostip.c b/Utilities/cmcurl/hostip.c
index fd555ef..83f1564 100644
--- a/Utilities/cmcurl/hostip.c
+++ b/Utilities/cmcurl/hostip.c
@@ -609,7 +609,7 @@ Curl_addrinfo *Curl_ip2addr(in_addr_t num, const char *hostname, int port)
   h = &buf->hostentry;
   h->h_addr_list = &buf->h_addr_list[0];
   addrentry = &buf->addrentry;
-#ifdef _CRAYC
+#ifdef _CRAY
   /* On UNICOS, s_addr is a bit field and for some reason assigning to it
    * doesn't work.  There must be a better fix than this ugly hack.
    */

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

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


hooks/post-receive
-- 
CMake