scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compile fixes for Apple GCC 4.2

Browse source
This commit is contained in:
Miodrag Milanovic 2015-02-15 18:59:47 +01:00
parent 93ea52c23a
commit 88998f7cd8
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
3rdparty/ib-compress/readbitstream.h vendored
View file

@ -95,16 +95,10 @@ inline ReadBitstream::ReadBitstream( const uint8_t* buffer, size_t bufferSize )
} }
} }
#if defined(__GNUC__) || defined(_MSC_VER)
#define U64(val) val##ULL
#else
#define U64(val) val
#endif
RBS_INLINE uint32_t ReadBitstream::Read( uint32_t bitCount ) RBS_INLINE uint32_t ReadBitstream::Read( uint32_t bitCount )
{ {
uint64_t mask = ( uint64_t( 1 ) << bitCount ) - 1; uint64_t mask = ( uint64_t( 1 ) << bitCount ) - 1;
uint32_t result = static_cast< uint32_t >( ( m_bitBuffer >> ( 64 - m_bitsLeft ) & ( m_bitsLeft == 0 ? 0 : U64(0xFFFFFFFFFFFFFFFF) ) ) & mask ); uint32_t result = static_cast< uint32_t >( ( m_bitBuffer >> ( 64 - m_bitsLeft ) & ( m_bitsLeft == 0 ? 0 : UINT64_C(0xFFFFFFFFFFFFFFFF) ) ) & mask );
if ( m_bitsLeft < bitCount ) if ( m_bitsLeft < bitCount )
{ {

4
examples/common/font/font_manager.cpp
View file

@ -13,12 +13,12 @@
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)) #if BX_COMPILER_MSVC || BX_COMPILER_GCC >= 40300
#pragma push_macro("interface") #pragma push_macro("interface")
#endif #endif
#undef interface #undef interface
#include <freetype/freetype.h> #include <freetype/freetype.h>
#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) #if BX_COMPILER_MSVC || BX_COMPILER_GCC >= 40300
#pragma pop_macro("interface") #pragma pop_macro("interface")
#endif #endif
BX_PRAGMA_DIAGNOSTIC_POP(); BX_PRAGMA_DIAGNOSTIC_POP();