X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=df6406d08fe39212d821ff906e3b5e16288bc505;hp=22866bc9e11573fe9b5de912a69abf9394de4b5c;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hpb=7237592a76cceda97a1c79904fed583e215d3fa9

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 22866bc9..df6406d0 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <stdint.h>
-#include <string.h>
+#include <babeltrace/compat/string.h>
 
 #define PERROR_BUFLEN	200
 
@@ -81,46 +81,20 @@ extern int babeltrace_verbose, babeltrace_debug;
 		perrorstr,						\
 		## args)
 
-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
-
 #define _bt_printf_perror(fp, fmt, args...)				\
 	({								\
 		char buf[PERROR_BUFLEN] = "Error in strerror_r()";	\
-		strerror_r(errno, buf, sizeof(buf));			\
+		compat_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()";	\
-		strerror_r(errno, buf, sizeof(buf));			\
+		compat_strerror_r(errno, buf, sizeof(buf));		\
 		_bt_printfle(fp, "error", lineno, buf, fmt, ## args);	\
 	})
 
-#else
-
-/*
- * Version using GNU strerror_r, for linux with appropriate defines.
- */
-
-#define _bt_printf_perror(fp, fmt, args...)				\
-	({								\
-		char *buf;						\
-		char tmp[PERROR_BUFLEN] = "Error in strerror_r()";	\
-		buf = strerror_r(errno, tmp, sizeof(tmp));		\
-		_bt_printfe(fp, "error", buf, fmt, ## args);		\
-	})
-
-#define _bt_printfl_perror(fp, lineno, fmt, args...)			\
-	({								\
-		char *buf;						\
-		char tmp[PERROR_BUFLEN] = "Error in strerror_r()";	\
-		buf = strerror_r(errno, tmp, sizeof(tmp));		\
-		_bt_printfle(fp, "error", lineno, buf, fmt, ## args);	\
-	})
-
-#endif
-
 /* printf without lineno information */
 #define printf_fatal(fmt, args...)					\
 	_bt_printf(stderr, "fatal", fmt, ## args)
@@ -190,8 +164,8 @@ 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 single_clock_offset_avg;
+	int64_t offset_first;
 	int64_t delta_offset_first_sum;
 	int offset_nr;
 	int clock_use_offset_avg;
@@ -219,6 +193,8 @@ extern int opt_all_field_names,
 	opt_clock_gmt,
 	opt_clock_force_correlate;
 
-extern uint64_t opt_clock_offset;
+extern int64_t opt_clock_offset;
+extern int64_t opt_clock_offset_ns;
+extern int babeltrace_ctf_console_output;
 
 #endif