WIP routesearch; New SQL_DISTINCT_{DECL,STEP}

[ypp-sc-tools.db-test.git] / yarrg / common.h

diff --git a/yarrg/common.h b/yarrg/common.h
index fdae435493488e71402c567bff9965022e2f4684..09bb391392e8d84f71e5de5f2c9b210d0cc7add9 100644 (file)
--- a/yarrg/common.h
+++ b/yarrg/common.h
@@ -83,10 +83,14 @@ enum {
 
 #endif /*DEBUG_FLAG_LIST*/
 
+#ifndef debug_flags
 extern unsigned debug_flags;
+#endif
 
 void debug_flush(void);
-#define debug stderr
+#ifndef debug
+# define debug stderr
+#endif
 
 #define FMT(f,a) __attribute__((format(printf,f,a)))
 #define SCANFMT(f,a) __attribute__((format(scanf,f,a)))
@@ -137,6 +141,7 @@ void waitpid_check_exitstatus(pid_t pid, const char *what, int sigpipeok);
 
 
 void *mmalloc(size_t sz);
+void *mcalloc(size_t sz);
 void *mrealloc(void *p, size_t sz);
 
 char *masprintf(const char *fmt, ...) FMT(1,2);