Bug fix for printing ...

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 3d3adba8cb5df9e6956731cef0d6227cdb795f72..3a0eeaa01c4dd3a0ad0c8e9f7416968ef323f968 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -19,19 +19,18 @@
 #include "time.h"
 
 
-#ifdef SATCHECK_CONFIG
+#if 0
 extern int model_out;
 extern int model_err;
 extern int switch_alloc;
 
-#define model_dprintf(fd, fmt, ...) do { switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = 0; } while (0)
+#define model_dprintf(fd, fmt, ...) do { int oldsw = switch_alloc; switch_alloc = 1; dprintf(fd, fmt, ## __VA_ARGS__); switch_alloc = oldsw; } while (0)
 
 #define model_print(fmt, ...) do { model_dprintf(model_out, fmt, ## __VA_ARGS__); } while (0)
 #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
 #else
-    #define model_print printf
+#define model_print printf
 #endif
-#define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)
 
 
 
@@ -56,9 +55,9 @@ void assert_hook(void);
                if (!(expr)) { \
                        fprintf(stderr, "Error: assertion failed in %s at line %d\n", __FILE__, __LINE__); \
                        /* print_trace(); // Trace printing may cause dynamic memory allocation */ \
-                       assert_hook();                           \
-                       exit(EXIT_FAILURE); \
-               } \
+                       assert_hook();                                                                                                   \
+                       exit(EXIT_FAILURE);     \
+               }       \
        } while (0)
 #else
 #define ASSERT(expr) \