sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

lib.h: corrected 2 casts:

Browse Source 
- problem when using CHECK_ERR with functions returning a Handle
- incorrect sign conversion when passing non-ascii (> 0x80) chars to
FOURCC

precompiled.h: include lib/types.h

This was SVN commit r1654.
This commit is contained in:
janwas 2005-01-07 00:55:53 +00:00
parent 2077d4fd1d
commit 39783e6a17
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/lib/lib.h
View File

@ -57,11 +57,15 @@ STMT(\
}\ }\
) )
// note: UINT_MAX is necessary when testing a Handle value and
// also returning Handle. the negative value (error return)
// is guaranteed to fit into an int, but we need to "mask"
// it to avoid VC cast-to-smaller-type warnings.
#ifdef _WIN32 #ifdef _WIN32
#define CHECK_ERR(func)\ #define CHECK_ERR(func)\
STMT(\ STMT(\
int err__ = (int)(func);\ int err__ = (int)((func) & UINT_MAX);\
if(err__ < 0)\ if(err__ < 0)\
{\ {\
assert(0 && "FYI: CHECK_ERR reports that a function failed."\ assert(0 && "FYI: CHECK_ERR reports that a function failed."\
@ -72,7 +76,7 @@ STMT(\
#else #else
#define CHECK_ERR(func)\ #define CHECK_ERR(func)\
STMT(\ STMT(\
int err__ = (int)(func);\ int err__ = (int)((func) & UINT_MAX);\
if(err__ < 0)\ if(err__ < 0)\
{\ {\
debug_out("%s:%d: FYI: CHECK_ERR reports that a function failed."\ debug_out("%s:%d: FYI: CHECK_ERR reports that a function failed."\
@ -230,12 +234,17 @@ enum LibError
// can't pass code as string, and use s[0]..s[3], because // can't pass code as string, and use s[0]..s[3], because
// VC6/7 don't realize the macro is constant // VC6/7 don't realize the macro is constant
// (it should be useable as a switch{} expression) // (it should be useable as a switch{} expression)
//
// these casts are ugly but necessary. u32 is required because u8 << 8 == 0;
// the additional u8 cast ensures each character is treated as unsigned
// (otherwise, they'd be promoted to signed int before the u32 cast,
// which would break things).
#if SDL_BYTE_ORDER == SDL_BIG_ENDIAN #if SDL_BYTE_ORDER == SDL_BIG_ENDIAN
#define FOURCC(a,b,c,d) ( ((u32)a << 24) | ((u32)b << 16) | \ #define FOURCC(a,b,c,d) ( ((u32)(u8)a) << 24 | ((u32)(u8)b) << 16 | \
((u32)c << 8 ) | ((u32)d << 0 ) ) ((u32)(u8)c) << 8 | ((u32)(u8)d) << 0 )
#else #else
#define FOURCC(a,b,c,d) ( ((u32)a << 0 ) | ((u32)b << 8 ) | \ #define FOURCC(a,b,c,d) ( ((u32)(u8)a) << 0 | ((u32)(u8)b) << 8 | \
((u32)c << 16) | ((u32)d << 24) ) ((u32)(u8)c) << 16 | ((u32)(u8)d) << 24 )
#endif #endif

6
source/lib/precompiled.h
View File

@ -4,7 +4,8 @@
// hence, all files include precompiled.h and then all the headers they'd // hence, all files include precompiled.h and then all the headers they'd
// normally lead => best build performance with or without PCH. // normally lead => best build performance with or without PCH.
#include "config.h" #include "lib/config.h"
#include "lib/types.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable:4996) // function is deprecated #pragma warning(disable:4996) // function is deprecated
@ -57,6 +58,3 @@
#endif // HAVE_DEBUGALLOC #endif // HAVE_DEBUGALLOC
#endif // #ifdef HAVE_PCH #endif // #ifdef HAVE_PCH
// Macros for declaring new exception groups/types
#include "ps/Errors.h"