X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fcommon.h;h=fb4d7bacb1028c752f58dc62e947e214f4c05793;hp=52c0b5f7ebd85b9e0830bafee33367b18bc19123;hb=77f32c79afdf12f29c040d511cd84f15d703ceb9;hpb=85ade7953746f1f5e3df9c4e5799e216e44e1745 diff --git a/src/common.h b/src/common.h index 52c0b5f..fb4d7ba 100644 --- a/src/common.h +++ b/src/common.h @@ -18,21 +18,18 @@ #include "config.h" #include "time.h" -/* - 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_print(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0) - #define model_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} 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) - */ +#if 1 +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_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 +#endif #define NEXTPOW2(x) ((x == 1) ? 1 : (1 << (sizeof(uint) * 8 - __builtin_clz(x - 1)))) #define NUMBITS(x) ((x == 0) ? 0 : 8 * sizeof(x) - __builtin_clz(x))