* include/freetype/internal/ftdebug.h: Disable MSVC warning C4127. This partially undoes commit 3f6e0e0c.
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
diff --git a/ChangeLog b/ChangeLog
index bf8cd32..b1e55a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-12 Werner Lemberg <wl@gnu.org>.
+
+ * include/freetype/internal/ftdebug.h: Disable MSVC warning C4127.
+
+ This partially undoes commit 3f6e0e0c.
+
2013-06-12 Werner Lemberg <wl@gnu.org>
More compiler warning fixes.
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 1ee120f..ede3872 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -248,6 +248,18 @@ FT_BEGIN_HEADER
ft_debug_init( void );
+#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */
+
+ /* We disable the warning `conditional expression is constant' here */
+ /* in order to compile cleanly with the maximum level of warnings. */
+ /* In particular, the warning complains about stuff like `while(0)' */
+ /* which is very useful in macro definitions. There is no benefit */
+ /* in having it enabled. */
+#pragma warning( disable : 4127 )
+
+#endif /* _MSC_VER */
+
+
FT_END_HEADER
#endif /* __FTDEBUG_H__ */