bug fix

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index fac5a0bef27eaded2e5993406bf8c7a30d7c51ee..401a5e8af7cece371f3bd29cfce27ec0f211a0c9 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,19 +18,22 @@
 #include "config.h"
 #include "time.h"
 
-#if 1
+#define NANOSEC 1000000000.0
+
+#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)
+
+
 
 #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))