summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-11-08 20:10:34 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-11-08 20:10:34 (GMT)
commitf5ff79e8bd268cfda375ddba1261675a16cd224e (patch)
treee514e85f4d941ba4515326be0e3d614925a5f713 /Utilities
parent054eed58197aae6e8eb4b6fd2d080bffe31bb35b (diff)
downloadCMake-f5ff79e8bd268cfda375ddba1261675a16cd224e.zip
CMake-f5ff79e8bd268cfda375ddba1261675a16cd224e.tar.gz
CMake-f5ff79e8bd268cfda375ddba1261675a16cd224e.tar.bz2
remove a few more windows warnings
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_windows.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_windows.h b/Utilities/cmlibarchive/libarchive/archive_windows.h
index 0a9b826..40d88e5 100644
--- a/Utilities/cmlibarchive/libarchive/archive_windows.h
+++ b/Utilities/cmlibarchive/libarchive/archive_windows.h
@@ -78,8 +78,13 @@
#if defined(_MSC_VER)
/* TODO: Fix the code, don't suppress the warnings. */
-#pragma warning(disable:4244) /* 'conversion' conversion from 'type1' to 'type2', possible loss of data */
+#pragma warning(disable:4761) /* 'conversion' conversion from 'type1' to 'type2', possible loss of data */
+/* this one shows up on vs 6 */
+# if _MSC_VER < 1300
+# pragma warning(disable:4244) /* 'integral size mismatch in argument; conversion supplied */
+# endif
#pragma warning(default: 4365) /* 'action':conversion from 'type_1' to 'type_2', signed/unsigned mismatch */
+#pragma warning(disable: 4244) /* conversion from '__int64' to 'off_t', possible loss of data */
#endif
#ifndef NULL