mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9842) -Codechange: now NOT_REACHED is also triggered when debugging is disabled.

release/0.6
rubidium 2007-05-15 13:01:52 +00:00
parent 23492f1f34
commit f9e0d3835b
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/functions.h
View File

@ -30,7 +30,6 @@ StringID GetPlayerNameString(PlayerID player, uint index);
/* standard */ /* standard */
void ShowInfo(const char *str); void ShowInfo(const char *str);
void CDECL ShowInfoF(const char *str, ...); void CDECL ShowInfoF(const char *str, ...);
void NORETURN CDECL error(const char *str, ...);
/* openttd.cpp */ /* openttd.cpp */

10
src/stdafx.h
View File

@ -112,7 +112,6 @@
# define FORCEINLINE inline # define FORCEINLINE inline
# define CDECL # define CDECL
# define __int64 long long # define __int64 long long
# define NOT_REACHED() assert(0)
# define GCC_PACK __attribute__((packed)) # define GCC_PACK __attribute__((packed))
# if (__GNUC__ == 2) # if (__GNUC__ == 2)
@ -125,7 +124,6 @@
# define NORETURN # define NORETURN
# define FORCEINLINE inline # define FORCEINLINE inline
# define CDECL # define CDECL
# define NOT_REACHED() assert(0)
# define GCC_PACK # define GCC_PACK
# include <malloc.h> # include <malloc.h>
#endif /* __WATCOMC__ */ #endif /* __WATCOMC__ */
@ -163,11 +161,6 @@
# define FORCEINLINE __forceinline # define FORCEINLINE __forceinline
# define inline _inline # define inline _inline
# define CDECL _cdecl # define CDECL _cdecl
# if defined(_DEBUG)
# define NOT_REACHED() assert(0)
# else
# define NOT_REACHED() _assume(0)
# endif /* _DEBUG */
int CDECL snprintf(char *str, size_t size, const char *format, ...); int CDECL snprintf(char *str, size_t size, const char *format, ...);
# if _MSC_VER < 1400 # if _MSC_VER < 1400
int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap); int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap);
@ -334,4 +327,7 @@ assert_compile(sizeof(uint8) == 1);
# define Point OTTD_AMIGA_POINT # define Point OTTD_AMIGA_POINT
#endif #endif
void NORETURN CDECL error(const char *str, ...);
#define NOT_REACHED() error("NOT_REACHED triggered at line %i of %s", __LINE__, __FILE__)
#endif /* STDAFX_H */ #endif /* STDAFX_H */