summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-07-17 13:43:27 (GMT)
committerBrad King <brad.king@kitware.com>2014-07-17 13:43:27 (GMT)
commit9d2bada3d4948f2a7c40d3e73ebc0a15d1c2dc3a (patch)
treedbd5ad128cddb81f2279e8c5381fc68495758e1f
parentd8934eedaf679d45b2f183aa2f6f70ac1eaa93a1 (diff)
parentfd63722dc86ec30e8a6f543881d56b3c473da34d (diff)
downloadCMake-9d2bada3d4948f2a7c40d3e73ebc0a15d1c2dc3a.zip
CMake-9d2bada3d4948f2a7c40d3e73ebc0a15d1c2dc3a.tar.gz
CMake-9d2bada3d4948f2a7c40d3e73ebc0a15d1c2dc3a.tar.bz2
Merge branch 'compile-with-cray' into release
-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.
*/