X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=535f99094970161856927d5adcd6d1fb7753cc0d;hb=6fbd4105b92d0da8b3c5818a5b7c5b07850f4a01;hp=6384eee007f4d2bf922ab4a2d77dc253a49f9346;hpb=695f152d09b677dab15e38dd5d33d829d8d9acb8;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 6384eee0..535f9909 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -27,11 +27,14 @@
 #include <stdio.h>
 #include <glib.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdbool.h>
 #include <babeltrace/compat/string.h>
 
 #define PERROR_BUFLEN	200
 
-extern int babeltrace_verbose, babeltrace_debug;
+extern bool babeltrace_verbose, babeltrace_debug;
 
 #define printf_verbose(fmt, args...)					\
 	do {								\
@@ -159,6 +162,16 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define max(a, b)	(((a) > (b)) ? (a) : (b))
 #endif
 
+#ifndef max_t
+#define max_t(type, a, b)	\
+	((type) (a) > (type) (b) ? (type) (a) : (type) (b))
+#endif
+
+/*
+ * Memory allocation zeroed
+ */
+#define zmalloc(x) calloc(1, x)
+
 /*
  * BT_HIDDEN: set the hidden attribute for internal functions
  */
@@ -167,6 +180,9 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define BT_CTF_MAJOR	1
 #define BT_CTF_MINOR	8
 
+#define __STRINGIFY(x)	#x
+#define TOSTRING(x)	__STRINGIFY(x)
+
 struct bt_trace_descriptor;
 struct trace_collection {
 	GPtrArray *array;	/* struct bt_trace_descriptor */