After resolving conflicts

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index fac5a0bef27eaded2e5993406bf8c7a30d7c51ee..0efebf8152d581e20066ca2e32222b5be37e9717 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,6 +18,7 @@
 #include "config.h"
 #include "time.h"
 
+
 #if 1
 extern int model_out;
 extern int model_err;
@@ -32,6 +33,8 @@ extern int switch_alloc;
 #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))