Merge branch 'master' into brian

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 9b7848583f0eebd17bb0c23303af3dfb2590c4fb..5d8c389710200942c30681065f12a367696d430a 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include "config.h"
 
+/*
 extern int model_out;
 extern int model_err;
 extern int switch_alloc;
@@ -27,7 +28,12 @@ extern int switch_alloc;
 
 #define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
 
+*/
+
+#define model_print printf
+
 #define NEXTPOW2(x) (1<<(sizeof(uint)*8-__builtin_clz(x-1)))
+#define NUMBITS(x) ((x==0) ? 0 : 8*sizeof(x)-__builtin_clz(x))
 
 #ifdef CONFIG_DEBUG
 #define DEBUG(fmt, ...) do { model_print("*** %15s:%-4d %25s() *** " fmt, __FILE__, __LINE__, __func__, ## __VA_ARGS__); } while (0)