rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another try on pragmas. 

* include/freetype/internal/ftdebug.h: Move pragmas to...
* include/freetype/internal/internal.h: ... this file since it gets
included by all source files.
* include/freetype/internal/ftserv.h: Remove pragma which has no
effect.
This commit is contained in:
Werner Lemberg 2013-06-12 23:33:11 +02:00
parent 25b6e600c1
commit 294ce11b00
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2013-06-12 Werner Lemberg <wl@gnu.org>.
Another try on pragmas.
* include/freetype/internal/ftdebug.h: Move pragmas to...
* include/freetype/internal/internal.h: ... this file since it gets
included by all source files.
* include/freetype/internal/ftserv.h: Remove pragma which has no
effect.
2013-06-12 Werner Lemberg <wl@gnu.org>.
* include/freetype/internal/ftdebug.h: Disable MSVC warning C4127.

13
include/freetype/internal/ftdebug.h
View File

@ -247,19 +247,6 @@ FT_BEGIN_HEADER
FT_BASE( void )
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__ */

12
include/freetype/internal/ftserv.h
View File

@ -34,14 +34,6 @@
FT_BEGIN_HEADER
#if defined( _MSC_VER ) /* Visual C++ (and Intel C++) */
/* We disable the warning `conditional expression is */
/* constant' in order to compile cleanly with the maximum */
/* level of warnings. */
#pragma warning( push )
#pragma warning( disable : 4127 )
#endif /* _MSC_VER */
/*
* @macro:
* FT_FACE_FIND_SERVICE
@ -763,10 +755,6 @@ FT_BEGIN_HEADER
/* */
#if defined( _MSC_VER )
#pragma warning( pop )
#endif
FT_END_HEADER
#endif /* __FTSERV_H__ */

14
include/freetype/internal/internal.h
View File

@ -4,7 +4,7 @@
/* */
/* Internal header files (specification only). */
/* */
/* Copyright 1996-2001, 2002, 2003, 2004 by */
/* Copyright 1996-2004, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -48,4 +48,16 @@
#define FT_INTERNAL_AUTOHINT_H <freetype/internal/autohint.h>
#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 */
/* END */