diff options
| author | Eugene Sandulenko | 2005-12-03 14:34:45 +0000 | 
|---|---|---|
| committer | Eugene Sandulenko | 2005-12-03 14:34:45 +0000 | 
| commit | 71e21f0fdf996348afe256b51305c5cd5fba8e8a (patch) | |
| tree | 690ae0770cc59a53d24e5ae1b5c35a1219018c6e /backends/epoc/portdefs.h | |
| parent | 3a9bd3c18cacbd9b1d49107c6db609c7982940d6 (diff) | |
| download | scummvm-rg350-71e21f0fdf996348afe256b51305c5cd5fba8e8a.tar.gz scummvm-rg350-71e21f0fdf996348afe256b51305c5cd5fba8e8a.tar.bz2 scummvm-rg350-71e21f0fdf996348afe256b51305c5cd5fba8e8a.zip | |
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
Diffstat (limited to 'backends/epoc/portdefs.h')
| -rw-r--r-- | backends/epoc/portdefs.h | 33 | 
1 files changed, 17 insertions, 16 deletions
| 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<nmemb; i++) +	for (i = 0; i < nmemb; i++)  		if (compar(key, (void*)((size_t)base + size * i)) == 0)  			return (void*)((size_t)base + size * i); +  	return NULL;  }  #define bsearch						scumm_bsearch | 
