summaryrefslogtreecommitdiffstats
path: root/MD5.c
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2016-01-11 14:01:00 (GMT)
committerBrad King <brad.king@kitware.com>2016-01-11 16:20:13 (GMT)
commit8e7356a2921c769c091c52140564b04108e692c4 (patch)
tree84079122649bc65d0c3a35f5371269a2cca67815 /MD5.c
parentf2b0bf6e3f45f4f2a474732f29528299825bf7e9 (diff)
downloadCMake-8e7356a2921c769c091c52140564b04108e692c4.zip
CMake-8e7356a2921c769c091c52140564b04108e692c4.tar.gz
CMake-8e7356a2921c769c091c52140564b04108e692c4.tar.bz2
KWSys 2016-01-11 (e8bf616e)
Code extracted from: http://public.kitware.com/KWSys.git at commit e8bf616e3556368bf19dbebcd3529a89011ebacb (master). Upstream Shortlog ----------------- Brad King (1): e8bf616e SystemTools: Fix GetShortPath buffer sizing Jan van Dorsten (1): cfb2477d SystemTools: Simplify GetShortPath de-quoting step Robert Maynard (1): 8ef9773d Don't use clang diagnostic pragma's when compiling with ICC on OSX.
Diffstat (limited to 'MD5.c')
-rw-r--r--MD5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/MD5.c b/MD5.c
index a147057..b9d25a8 100644
--- a/MD5.c
+++ b/MD5.c
@@ -29,7 +29,7 @@
it in a single source file instead of a separate header and
implementation file. */
-#if defined(__clang__)
+#if defined(__clang__) && !defined(__INTEL_COMPILER)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wcast-align"
#endif
@@ -433,7 +433,7 @@ static void md5_finish(md5_state_t *pms, md5_byte_t digest[16])
digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
}
-#if defined(__clang__)
+#if defined(__clang__) && !defined(__INTEL_COMPILER)
# pragma clang diagnostic pop
#endif