Edits to merge

[satune.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 58ad1f1acdb2cbacf64c99e7b6576f4d3233134e..a15f7df3e64f0840f561f4ab8bbc801ef1995347 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -18,20 +18,21 @@
 #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)
+ */
 
-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_println(fmt, ...) do { model_print(fmt, ## __VA_ARGS__); model_print("\n");} while(0)
-#define model_print_err(fmt, ...) do { model_dprintf(model_err, fmt, ## __VA_ARGS__); } while (0)
-
-
-
-//#define model_print printf
+#define model_print printf
 
 #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))