mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r9842) -Codechange: now NOT_REACHED is also triggered when debugging is disabled.
This commit is contained in:
parent
23492f1f34
commit
f9e0d3835b
|
@ -30,7 +30,6 @@ StringID GetPlayerNameString(PlayerID player, uint index);
|
|||
/* standard */
|
||||
void ShowInfo(const char *str);
|
||||
void CDECL ShowInfoF(const char *str, ...);
|
||||
void NORETURN CDECL error(const char *str, ...);
|
||||
|
||||
/* openttd.cpp */
|
||||
|
||||
|
|
10
src/stdafx.h
10
src/stdafx.h
|
@ -112,7 +112,6 @@
|
|||
# define FORCEINLINE inline
|
||||
# define CDECL
|
||||
# define __int64 long long
|
||||
# define NOT_REACHED() assert(0)
|
||||
# define GCC_PACK __attribute__((packed))
|
||||
|
||||
# if (__GNUC__ == 2)
|
||||
|
@ -125,7 +124,6 @@
|
|||
# define NORETURN
|
||||
# define FORCEINLINE inline
|
||||
# define CDECL
|
||||
# define NOT_REACHED() assert(0)
|
||||
# define GCC_PACK
|
||||
# include <malloc.h>
|
||||
#endif /* __WATCOMC__ */
|
||||
|
@ -163,11 +161,6 @@
|
|||
# define FORCEINLINE __forceinline
|
||||
# define inline _inline
|
||||
# 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, ...);
|
||||
# if _MSC_VER < 1400
|
||||
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
|
||||
#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 */
|
||||
|
|
Loading…
Reference in New Issue