From 25b6e600c17a647f5bc54658a6862819600fa37e Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 12 Jun 2013 11:06:34 +0200 Subject: [PATCH] * include/freetype/internal/ftdebug.h: Disable MSVC warning C4127. This partially undoes commit 3f6e0e0c. --- ChangeLog | 6 ++++++ include/freetype/internal/ftdebug.h | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index bf8cd32cb..b1e55a693 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-06-12 Werner Lemberg . + + * include/freetype/internal/ftdebug.h: Disable MSVC warning C4127. + + This partially undoes commit 3f6e0e0c. + 2013-06-12 Werner Lemberg More compiler warning fixes. diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h index 1ee120f5e..ede3872b0 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__ */