Change behaviour of stream-intersection with multiple traces

[babeltrace.git] / include / babeltrace / babeltrace-internal.h

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 22866bc9e11573fe9b5de912a69abf9394de4b5c..2f15a681a8db5ccdc550e9f8ba37d13474972295 100644 (file)
--- 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));                    \
-               _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));              \
+               compat_strerror_r(errno, buf, sizeof(buf));             \
                _bt_printfle(fp, "error", lineno, buf, fmt, ## args);   \
        })
 
-#endif
-
 /* printf without lineno information */
 #define printf_fatal(fmt, args...)                                     \
        _bt_printf(stderr, "fatal", fmt, ## args)
@@ -177,6 +151,14 @@ 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
+
 /*
  * BT_HIDDEN: set the hidden attribute for internal functions
  */
@@ -190,8 +172,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;
@@ -217,8 +199,13 @@ extern int opt_all_field_names,
        opt_clock_seconds,
        opt_clock_date,
        opt_clock_gmt,
-       opt_clock_force_correlate;
-
-extern uint64_t opt_clock_offset;
+       opt_clock_force_correlate,
+       opt_debug_info_full_path;
+
+extern int64_t opt_clock_offset;
+extern int64_t opt_clock_offset_ns;
+extern int babeltrace_ctf_console_output;
+extern char *opt_debug_info_dir;
+extern char *opt_debug_info_target_prefix;
 
 #endif