Commit ca3939e682a3198a3d18f42b7fbf84823312dc61
2010-06-03T22:28:30
msvc: Disable a level 4 warning and change -W3 to -W4 Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/Makefile b/Makefile
index 5018a35..ab56850 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ ifeq ($(uname_S),Windows)
RANLIB = echo
CC = cl -nologo
AR = lib -nologo
- CFLAGS = -TC -W3 -RTC1 -Zi -DWIN32 -D_DEBUG -D_LIB
+ CFLAGS = -TC -W4 -RTC1 -Zi -DWIN32 -D_DEBUG -D_LIB
AR_OUT=-out:
CC_OUT=-Fo
NO_VISIBILITY=YesPlease
diff --git a/src/cc-compat.h b/src/cc-compat.h
index 5071d53..cf6cccf 100644
--- a/src/cc-compat.h
+++ b/src/cc-compat.h
@@ -66,6 +66,8 @@
#if defined(_MSC_VER)
/* disable "deprecated function" warnings */
# pragma warning ( disable : 4996 )
+/* disable "conditional expression is constant" level 4 warnings */
+# pragma warning ( disable : 4127 )
#endif
#endif /* INCLUDE_compat_h__ */
diff --git a/tests/Makefile b/tests/Makefile
index e3059f5..2525ae8 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -28,7 +28,7 @@ CC_OUT=-o # add a space
ifeq ($(uname_S),Windows)
CC = cl -nologo
LD = link -nologo
- CFLAGS = -TC -W3 -RTC1 -Zi -DWIN32 -D_DEBUG -D_LIB
+ CFLAGS = -TC -W4 -RTC1 -Zi -DWIN32 -D_DEBUG -D_LIB
LD_OUT=-out:
CC_OUT=-Fo