|
@@ -13,10 +13,14 @@
|
|
|
|
|
|
|
|
BX_PRAGMA_DIAGNOSTIC_PUSH();
|
|
BX_PRAGMA_DIAGNOSTIC_PUSH();
|
|
|
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4245) // error C4245: '=' : conversion from 'int' to 'FT_UInt', signed/unsigned mismatch
|
|
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4245) // error C4245: '=' : conversion from 'int' to 'FT_UInt', signed/unsigned mismatch
|
|
|
|
|
+#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
|
|
|
#pragma push_macro("interface")
|
|
#pragma push_macro("interface")
|
|
|
|
|
+#endif
|
|
|
#undef interface
|
|
#undef interface
|
|
|
#include <freetype/freetype.h>
|
|
#include <freetype/freetype.h>
|
|
|
|
|
+#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
|
|
|
#pragma pop_macro("interface")
|
|
#pragma pop_macro("interface")
|
|
|
|
|
+#endif
|
|
|
BX_PRAGMA_DIAGNOSTIC_POP();
|
|
BX_PRAGMA_DIAGNOSTIC_POP();
|
|
|
|
|
|
|
|
#include "../common.h"
|
|
#include "../common.h"
|