Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes for Apple GCC 4.2

Browse Source
This commit is contained in:
Miodrag Milanovic
2015-02-15 13:55:45 +01:00
parent 39e6eff1e0
commit 93ea52c23a
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
3rdparty/ib-compress/readbitstream.h vendored
View File

@@ -95,11 +95,16 @@ 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 )
{
uint64_t mask = ( uint64_t( 1 ) << bitCount ) - 1;
uint32_t result = static_cast< uint32_t >( ( m_bitBuffer >> ( 64 - m_bitsLeft ) & ( m_bitsLeft == 0 ? 0 : 0xFFFFFFFFFFFFFFFF ) ) & mask );
uint32_t result = static_cast< uint32_t >( ( m_bitBuffer >> ( 64 - m_bitsLeft ) & ( m_bitsLeft == 0 ? 0 : U64(0xFFFFFFFFFFFFFFFF) ) ) & mask );
if ( m_bitsLeft < bitCount )
{

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

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

2
examples/common/nanovg/fontstash.h
View File

@@ -428,6 +428,7 @@ struct FONScontext
void* errorUptr;
};
#if 0
static void* fons__tmpalloc(size_t size, void* up)
{
unsigned char* ptr;
@@ -453,6 +454,7 @@ static void fons__tmpfree(void* ptr, void* up)
// empty
}
#endif
// Copyright (c) 2008-2010 Bjoern Hoehrmann <bjoern@hoehrmann.de>
// See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.