X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=017cb4f99dd2adba81301d185efb89405cfab79e;hb=88ccfdff63126a0fa70c094c7ed7e66f68e1b861;hp=bb66c3a7f5d9cab70b680a8f2f42b89c7c468547;hpb=be86dd6ef8bd6194f13b0babaa03fd45d39ff767;p=c11tester.git

diff --git a/common.h b/common.h
index bb66c3a7..017cb4f9 100644
--- a/common.h
+++ b/common.h
@@ -1,10 +1,12 @@
+/** @file common.h
+ *  @brief General purpose macros.
+ */
+
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
 #include <stdio.h>
-#include <stdlib.h>
-
-//#define CONFIG_DEBUG
+#include "config.h"
 
 #ifdef CONFIG_DEBUG
 #define DEBUG(fmt, ...) do { printf("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
@@ -20,15 +22,10 @@
 do { \
 	if (!(expr)) { \
 		fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
-		exit(1); \
+		exit(EXIT_FAILURE); \
 	} \
 } while (0);
 
-
-void * myMalloc(size_t size);
-void myFree(void *ptr);
-
-#define userMalloc(size)	malloc(size)
-#define userFree(ptr)		free(ptr)
+#define error_msg(...) fprintf(stderr, "Error: " __VA_ARGS__)
 
 #endif /* __COMMON_H__ */