Added support for non-aborting assertions

- Added Assert_ret, Assert_retv, Assert_retb, Assert_retr, working
  similarly to the corresponding nullpo_ functions.
- Moved Assert-related macros to nullpo.h, since they share some
  functions.

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 1 insertions, 18 deletions

diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index 6de2ace01..d00f49864 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -353,23 +353,6 @@ typedef char bool;
 #endif
 
 //////////////////////////////////////////////////////////////////////////
-// Assert
-
-#if ! defined(Assert)
-#if defined(RELEASE)
-#define Assert(EX)
-#else
-// extern "C" {
-#include <assert.h>
-// }
-#if !defined(DEFCPP) && defined(WIN32) && !defined(MINGW)
-#include <crtdbg.h>
-#endif
-#define Assert(EX) assert(EX)
-#endif
-#endif /* ! defined(Assert) */
-
-//////////////////////////////////////////////////////////////////////////
 // Has to be unsigned to avoid problems in some systems
 // Problems arise when these functions expect an argument in the range [0,256[ and are fed a signed char.
 #include <ctype.h>
@@ -405,7 +388,7 @@ typedef char bool;
 
 
 //////////////////////////////////////////////////////////////////////////
-// Use the preprocessor to 'stringify' stuff (concert to a string).
+// Use the preprocessor to 'stringify' stuff (convert to a string).
 // example:
 //   #define TESTE blabla
 //   QUOTE(TESTE) -> "TESTE"