summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-05-15 13:01:52 +0000
committerrubidium <rubidium@openttd.org>2007-05-15 13:01:52 +0000
commitf17f17fa45086a66744cbcbb40b96ab31470f9c5 (patch)
tree25c877607c434741a47ffa5644eace5494ff2cb4
parent08be68e0b4b58ecde33154ead6284d4eed78ccec (diff)
downloadopenttd-f17f17fa45086a66744cbcbb40b96ab31470f9c5.tar.xz
(svn r9842) -Codechange: now NOT_REACHED is also triggered when debugging is disabled.
-rw-r--r--src/functions.h1
-rw-r--r--src/stdafx.h10
2 files changed, 3 insertions, 8 deletions
diff --git a/src/functions.h b/src/functions.h
index 714316b61..2540843da 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -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 */
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 <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 */