summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-07-17 13:42:57 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-07-17 13:42:57 (GMT)
commit96f2a2a2eddc4f0591abe6b49f5c7a335515f971 (patch)
treec3aaa6d913552f96b6b8de474c23725f0a9b6d33
parente411b3084241109f98b75ae2d7619eae40ca1e3d (diff)
parentfd63722dc86ec30e8a6f543881d56b3c473da34d (diff)
downloadCMake-96f2a2a2eddc4f0591abe6b49f5c7a335515f971.zip
CMake-96f2a2a2eddc4f0591abe6b49f5c7a335515f971.tar.gz
CMake-96f2a2a2eddc4f0591abe6b49f5c7a335515f971.tar.bz2
Merge topic 'compile-with-cray'
fd63722d cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)
-rw-r--r--Utilities/cmcurl/hostip.c2
1 files changed, 1 insertions, 1 deletions
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.
*/