further cleanup of message callback changes

[dcpu16] / dcpu16.c

diff --git a/dcpu16.c b/dcpu16.c
index c63c8002ae3762c2aed40973745ae38047a04344..0b1d391e58261f46332fa914aeda4673abe889df 100644 (file)
--- a/dcpu16.c
+++ b/dcpu16.c
@@ -55,15 +55,15 @@ const char * const dcpu16_reg_names[] = {
 };
 
 #define MSG_(__level__, __vm__, ...) do { ((__vm__) ? ((struct dcpu16 *)(__vm__))->msg_cb_ : dcpu16_msg_)((__level__), __VA_ARGS__); } while (0)
-#define MSG_INFO(__vm__,...) MSG_(MSG_INFO, __vm__, __VA_ARGS__)
-#define MSG_ERROR(__vm__,...) MSG_(MSG_ERROR, __vm__, __VA_ARGS__)
+#define MSG_INFO(__vm__,...) MSG_(DCPU16_MSG_INFO, __vm__, __VA_ARGS__)
+#define MSG_ERROR(__vm__,...) MSG_(DCPU16_MSG_ERROR, __vm__, __VA_ARGS__)
 #ifdef DEBUG
-#define MSG_DEBUG(__vm__,...) MSG_(MSG_DEBUG, __vm__, __VA_ARGS__)
+#define MSG_DEBUG(__vm__,...) MSG_(DCPU16_MSG_DEBUG, __vm__, __VA_ARGS__)
 #else /* DEBUG */
 #define MSG_DEBUG(__vm__,...) do {} while (0)
 #endif /* DEBUG */
 #ifdef DEBUG_DECODE
-#define MSG_DEBUG_DECODE (MSG_DEBUG + 2)
+#define MSG_DEBUG_DECODE (DCPU16_MSG_DEBUG + 2)
 #endif /* DEBUG_DECODE
 
 /* messages could be sent nowhere */
@@ -74,7 +74,7 @@ static void msg_default_(unsigned int, char *, ...) __attribute__((format(printf
 static inline
 void msg_default_(unsigned int l, char *fmt, ...) {
     static const char * const msg_tag_[] = { "info", "error", "debug" };
-    FILE *f = (l <= MSG_INFO) ? stderr : stdout;
+    FILE *f = (l <= DCPU16_MSG_INFO) ? stderr : stdout;
     va_list ap;
 
     if (l < sizeof msg_tag_ / sizeof *msg_tag_)