X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=18ed309f86dc1823fcfecd0d32023d2ce1aa46d0;hb=c55a9f585da53ea54ac458155fac3cdec1779d47;hp=c9345509009d73eda04ab3df7ac4739980fa4d71;hpb=2654fe9bab8f0eaeb17264ef7abadfd14e245b23;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index c9345509..18ed309f 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 <babeltrace/compat/string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <babeltrace/compat/string-internal.h>
+#include <babeltrace/types.h>
 
 #define PERROR_BUFLEN	200
 
-extern int babeltrace_verbose, babeltrace_debug;
+extern bt_bool babeltrace_verbose, babeltrace_debug;
 
 #define printf_verbose(fmt, args...)					\
 	do {								\
@@ -84,14 +87,14 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define _bt_printf_perror(fp, fmt, args...)				\
 	({								\
 		char buf[PERROR_BUFLEN] = "Error in strerror_r()";	\
-		compat_strerror_r(errno, buf, sizeof(buf));		\
+		bt_strerror_r(errno, buf, sizeof(buf));		\
 		_bt_printfe(fp, "error", buf, fmt, ## args);		\
 	})
 
 #define _bt_printfl_perror(fp, lineno, fmt, args...)			\
 	({								\
 		char buf[PERROR_BUFLEN] = "Error in strerror_r()";	\
-		compat_strerror_r(errno, buf, sizeof(buf));		\
+		bt_strerror_r(errno, buf, sizeof(buf));		\
 		_bt_printfle(fp, "error", lineno, buf, fmt, ## args);	\
 	})
 
@@ -151,50 +154,30 @@ extern int babeltrace_verbose, babeltrace_debug;
 # endif
 #endif
 
+#ifndef min
+#define min(a, b)	(((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef max
+#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
  */
 #define BT_HIDDEN __attribute__((visibility("hidden")))
 
-#define BT_CTF_MAJOR	1
-#define BT_CTF_MINOR	8
-
-struct bt_trace_descriptor;
-struct trace_collection {
-	GPtrArray *array;	/* struct bt_trace_descriptor */
-	GHashTable *clocks;	/* struct ctf_clock */
-
-	uint64_t single_clock_offset_avg;
-	uint64_t offset_first;
-	int64_t delta_offset_first_sum;
-	int offset_nr;
-	int clock_use_offset_avg;
-};
-
-extern int opt_all_field_names,
-	opt_scope_field_names,
-	opt_header_field_names,
-	opt_context_field_names,
-	opt_payload_field_names,
-	opt_all_fields,
-	opt_trace_field,
-	opt_trace_domain_field,
-	opt_trace_procname_field,
-	opt_trace_vpid_field,
-	opt_trace_hostname_field,
-	opt_trace_default_fields,
-	opt_loglevel_field,
-	opt_emf_field,
-	opt_callsite_field,
-	opt_delta_field,
-	opt_clock_cycles,
-	opt_clock_seconds,
-	opt_clock_date,
-	opt_clock_gmt,
-	opt_clock_force_correlate;
-
-extern uint64_t opt_clock_offset;
-extern uint64_t opt_clock_offset_ns;
-extern int babeltrace_ctf_console_output;
+#define __STRINGIFY(x)	#x
+#define TOSTRING(x)	__STRINGIFY(x)
 
 #endif