X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcommon.h;h=3a0eeaa01c4dd3a0ad0c8e9f7416968ef323f968;hp=c94d6bdf4a5b8a9d51241f64253c50acaf55c591;hb=806a79424211fba5d68b6b802a6ceea2db47196f;hpb=54ba3c780c1bc435cbb6b202f2f0ee222df0a120 diff --git a/src/common.h b/src/common.h index c94d6bd..3a0eeaa 100644 --- a/src/common.h +++ b/src/common.h @@ -19,12 +19,12 @@ #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) @@ -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) \