X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcommon.h;h=3a0eeaa01c4dd3a0ad0c8e9f7416968ef323f968;hp=cc12ef8c354c746863bec0b9f641dbbe38a080b5;hb=83dd463dc62715df3cbdec888d1cc66f6cfe2c49;hpb=3174431d74be819f6da1068eb4484a3a0d32bd7c

diff --git a/src/common.h b/src/common.h
index cc12ef8..3a0eeaa 100644
--- a/src/common.h
+++ b/src/common.h
@@ -19,12 +19,12 @@
 #include "time.h"
 
 
-#if 1
+#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)
@@ -55,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) \