X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.h;h=1071135892ac11508c52459eee99e8d8da3ab254;hb=56596a27332a3622b935d5b75f81f4773dcbf757;hp=9c1e1ed384e199fd5e8761d8a37a34ab6787ad61;hpb=80f5924fb6c148ecb703dfeae5a751948062588b;p=model-checker.git

diff --git a/common.h b/common.h
index 9c1e1ed..1071135 100644
--- a/common.h
+++ b/common.h
@@ -8,12 +8,12 @@
 #include <stdio.h>
 #include "config.h"
 
-extern FILE *model_out;
+extern int model_out;
 
-#define model_print(fmt, ...) do { fprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
+#define model_print(fmt, ...) do { dprintf(model_out, fmt, ##__VA_ARGS__); } while (0)
 
 #ifdef CONFIG_DEBUG
-#define DEBUG(fmt, ...) do { model_print("*** %25s(): line %-4d *** " fmt, __func__, __LINE__, ##__VA_ARGS__); } while (0)
+#define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ##__VA_ARGS__); } while (0)
 #define DBG() DEBUG("\n")
 #define DBG_ENABLED() (1)
 #else