From f17f17fa45086a66744cbcbb40b96ab31470f9c5 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 15 May 2007 13:01:52 +0000 Subject: (svn r9842) -Codechange: now NOT_REACHED is also triggered when debugging is disabled. --- src/stdafx.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/stdafx.h') diff --git a/src/stdafx.h b/src/stdafx.h index 507c961b7..b86c9b4a4 100644 --- a/src/stdafx.h +++ b/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 #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 */ -- cgit v1.2.3-54-g00ecf