Fix Savannah bug #40451.

Simply apply the patch from the bug report.

* builds/unix/ftconfig.in, builds/vms/ftconfig.h,
include/freetype/config/ftconfig.h: The used #pragma directives only
work with gcc versions 4.6 and higher.
This commit is contained in:
Werner Lemberg 2013-11-02 08:28:41 +01:00
parent afa0d59ee5
commit 35b0818986
4 changed files with 22 additions and 0 deletions

View File

@ -1,3 +1,13 @@
2013-11-02 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #40451.
Simply apply the patch from the bug report.
* builds/unix/ftconfig.in, builds/vms/ftconfig.h,
include/freetype/config/ftconfig.h: The used #pragma directives only
work with gcc versions 4.6 and higher.
2013-11-01 Werner Lemberg <wl@gnu.org>
* docs/CHANGES: Updated.

View File

@ -520,8 +520,10 @@ FT_BEGIN_HEADER
{
/* Temporarily disable the warning that C90 doesn't support */
/* `long long'. */
#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlong-long"
#endif
#if 1
/* Technically not an assembly fragment, but GCC does a really good */
@ -560,7 +562,9 @@ FT_BEGIN_HEADER
return (FT_Int32)result;
#endif
#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
#pragma GCC diagnostic pop
#endif
}
#endif /* __GNUC__ && __x86_64__ */

View File

@ -456,8 +456,10 @@ FT_BEGIN_HEADER
{
/* Temporarily disable the warning that C90 doesn't support */
/* `long long'. */
#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlong-long"
#endif
#if 1
/* Technically not an assembly fragment, but GCC does a really good */
@ -496,7 +498,9 @@ FT_BEGIN_HEADER
return (FT_Int32)result;
#endif
#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
#pragma GCC diagnostic pop
#endif
}
#endif /* __GNUC__ && __x86_64__ */

View File

@ -487,8 +487,10 @@ FT_BEGIN_HEADER
{
/* Temporarily disable the warning that C90 doesn't support */
/* `long long'. */
#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlong-long"
#endif
#if 1
/* Technically not an assembly fragment, but GCC does a really good */
@ -527,7 +529,9 @@ FT_BEGIN_HEADER
return (FT_Int32)result;
#endif
#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) )
#pragma GCC diagnostic pop
#endif
}
#endif /* __GNUC__ && __x86_64__ */