Use the CHECK macros from the common dir

git-svn-id: svn://svn.cc65.org/cc65/trunk@249 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/error.h b/src/ar65/error.h
index 1f6823269b6d2b48e1e24f51a70ea42b54559eda..61d2a039487847ef50ec982506868daa40c813f7 100644 (file)
--- a/src/ar65/error.h
+++ b/src/ar65/error.h
@@ -43,19 +43,6 @@
 
 
 
-/*****************************************************************************/
-/*                                  Data                                    */
-/*****************************************************************************/
-
-
-
-/* Messages for internal compiler errors */
-extern const char _MsgCheckFailed [];
-extern const char _MsgPrecondition [];
-extern const char _MsgFail [];
-
-
-
 /*****************************************************************************/
 /*                                          Code                                    */
 /*****************************************************************************/
@@ -71,17 +58,6 @@ void Error (const char* Format, ...) attribute((format(printf,1,2)));
 void Internal (const char* Format, ...) attribute((format(printf,1,2)));
 /* Print an internal error message and die */
 
-#define CHECK(c)                                                       \
-    if (!(c))                                                          \
-       Internal (_MsgCheckFailed, #c, c, __FILE__, __LINE__)
-
-#define PRECONDITION(c)                                                        \
-    if (!(c))                                                          \
-               Internal (_MsgPrecondition, #c, c, __FILE__, __LINE__)
-
-#define FAIL(s)                                                                \
-    Internal (_MsgFail, s, __FILE__, __LINE__)
-
 
 
 /* End of error.h */

diff --git a/src/ar65/objdata.c b/src/ar65/objdata.c
index c2d830f8e144d340a41bd0b6a4b8198b5539935f..5c979e8f54582a00b73c014f7cd0c0561a91259b 100644 (file)
--- a/src/ar65/objdata.c
+++ b/src/ar65/objdata.c
@@ -35,8 +35,11 @@
 
 #include <string.h>
 
-#include "../common/xmalloc.h"
-
+/* common */
+#include "check.h"
+#include "xmalloc.h"
+                 
+/* ar65 */
 #include "error.h"
 #include "objdata.h"