From 71e21f0fdf996348afe256b51305c5cd5fba8e8a Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 3 Dec 2005 14:34:45 +0000 Subject: Fix code formatting to be compliant with our rules. It may happen that I broke something since I have no means to compile it. Also I changed EScummVM -> ScummVM is several places. svn-id: r19734 --- backends/epoc/portdefs.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'backends/epoc/portdefs.h') diff --git a/backends/epoc/portdefs.h b/backends/epoc/portdefs.h index 863e62fbee..846a916508 100644 --- a/backends/epoc/portdefs.h +++ b/backends/epoc/portdefs.h @@ -35,43 +35,44 @@ // the place in Symbian FS where scummvm.ini & std***.txt are saved -#define SYMBIAN32_DOC_DIR "C:\\documents\\EScummVM\\" // includes final \\! +#define SYMBIAN32_DOC_DIR "C:\\documents\\ScummVM\\" // includes final \\! #define DISABLE_SCALERS // we only need 1x // hack in some tricks to work around not having these fcns for Symbian // and we _really_ don't wanna link with any other windows LIBC library! #ifdef __GCC32__ - #define snprintf(buf,len,args...) sprintf(buf,args) - #define vsnprintf snprintf +#define snprintf(buf,len,args...) sprintf(buf, args) +#define vsnprintf snprintf #else // WINS - // let's just blatantly ignore this for now and just get it to work :P but does n't work from the debug function - int inline scumm_snprintf (char *str, unsigned long /*n*/, char const *fmt, ...) - { - va_list args; - va_start(args, fmt); - vsprintf(str, fmt, args); - va_end(args); - return strlen(str); - } +// let's just blatantly ignore this for now and just get it to work :P but does n't work from the debug function +int inline scumm_snprintf (char *str, unsigned long /*n*/, char const *fmt, ...) { + va_list args; + va_start(args, fmt); + vsprintf(str, fmt, args); + va_end(args); - #define snprintf scumm_snprintf - #define vsnprintf scumm_snprintf + return strlen(str); +} + +#define snprintf scumm_snprintf +#define vsnprintf scumm_snprintf #endif // somehow nobody has this function... -#define hypot(a, b) sqrt((a)*(a) + (b)*(b)) +#define hypot(a, b) sqrt((a) * (a) + (b) * (b)) // Symbian bsearch implementation is flawed void inline *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) { size_t i; - for (i=0; i