zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use byte swapping functions from <libkern/OSByteOrder.h> on OS X

Browse source 
Remove inclusion of Core Foundation headers to avoid type conflicts with LZMA SDK.
This commit is contained in:
alexey.lysiuk 2014-06-28 10:49:59 +03:00
parent d941203ab0
commit e6d468eb38
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/m_swap.h
View file

@ -29,51 +29,51 @@
// WAD files are stored little endian. // WAD files are stored little endian.
#ifdef __APPLE__ #ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h> #include <libkern/OSByteOrder.h>
inline short LittleShort(short x) inline short LittleShort(short x)
{ {
return (short)CFSwapInt16LittleToHost((uint16_t)x); return (short)OSSwapLittleToHostInt16((uint16_t)x);
} }
inline unsigned short LittleShort(unsigned short x) inline unsigned short LittleShort(unsigned short x)
{ {
return CFSwapInt16LittleToHost(x); return OSSwapLittleToHostInt16(x);
} }
inline short LittleShort(int x) inline short LittleShort(int x)
{ {
return CFSwapInt16LittleToHost((uint16_t)x); return OSSwapLittleToHostInt16((uint16_t)x);
} }
inline int LittleLong(int x) inline int LittleLong(int x)
{ {
return CFSwapInt32LittleToHost((uint32_t)x); return OSSwapLittleToHostInt32((uint32_t)x);
} }
inline unsigned int LittleLong(unsigned int x) inline unsigned int LittleLong(unsigned int x)
{ {
return CFSwapInt32LittleToHost(x); return OSSwapLittleToHostInt32(x);
} }
inline short BigShort(short x) inline short BigShort(short x)
{ {
return (short)CFSwapInt16BigToHost((uint16_t)x); return (short)OSSwapBigToHostInt16((uint16_t)x);
} }
inline unsigned short BigShort(unsigned short x) inline unsigned short BigShort(unsigned short x)
{ {
return CFSwapInt16BigToHost(x); return OSSwapBigToHostInt16(x);
} }
inline int BigLong(int x) inline int BigLong(int x)
{ {
return CFSwapInt32BigToHost((uint32_t)x); return OSSwapBigToHostInt32((uint32_t)x);
} }
inline unsigned int BigLong(unsigned int x) inline unsigned int BigLong(unsigned int x)
{ {
return CFSwapInt32BigToHost(x); return OSSwapBigToHostInt32(x);
} }
#else #else