Port: replace strerror_r() with glib g_strerror()

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

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 535f99094970161856927d5adcd6d1fb7753cc0d..006bf8f3c7954618eb10fc9772ed6ce4822a6775 100644 (file)
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -29,12 +29,12 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <stdbool.h>
-#include <babeltrace/compat/string.h>
+#include <babeltrace/compat/string-internal.h>
+#include <babeltrace/types.h>
 
 #define PERROR_BUFLEN  200
 
-extern bool babeltrace_verbose, babeltrace_debug;
+extern bt_bool babeltrace_verbose, babeltrace_debug;
 
 #define printf_verbose(fmt, args...)                                   \
        do {                                                            \
@@ -86,16 +86,16 @@ extern bool babeltrace_verbose, babeltrace_debug;
 
 #define _bt_printf_perror(fp, fmt, args...)                            \
        ({                                                              \
-               char buf[PERROR_BUFLEN] = "Error in strerror_r()";      \
-               bt_strerror_r(errno, buf, sizeof(buf));         \
-               _bt_printfe(fp, "error", buf, fmt, ## args);            \
+               const char *errstr;                                     \
+               errstr = g_strerror(errno);                             \
+               _bt_printfe(fp, "error", errstr, fmt, ## args);         \
        })
 
 #define _bt_printfl_perror(fp, lineno, fmt, args...)                   \
        ({                                                              \
-               char buf[PERROR_BUFLEN] = "Error in strerror_r()";      \
-               bt_strerror_r(errno, buf, sizeof(buf));         \
-               _bt_printfle(fp, "error", lineno, buf, fmt, ## args);   \
+               const char *errstr;                                     \
+               errstr = g_strerror(errno);                             \
+               _bt_printfle(fp, "error", lineno, errstr, fmt, ## args);\
        })
 
 /* printf without lineno information */
@@ -174,54 +174,16 @@ extern bool babeltrace_verbose, babeltrace_debug;
 
 /*
  * BT_HIDDEN: set the hidden attribute for internal functions
+ * On Windows, symbols are local unless explicitly exported,
+ * see https://gcc.gnu.org/wiki/Visibility
  */
+#if defined(_WIN32) || defined(__CYGWIN__)
+#define BT_HIDDEN
+#else
 #define BT_HIDDEN __attribute__((visibility("hidden")))
-
-#define BT_CTF_MAJOR   1
-#define BT_CTF_MINOR   8
+#endif
 
 #define __STRINGIFY(x) #x
 #define TOSTRING(x)    __STRINGIFY(x)
 
-struct bt_trace_descriptor;
-struct trace_collection {
-       GPtrArray *array;       /* struct bt_trace_descriptor */
-       GHashTable *clocks;     /* struct ctf_clock */
-
-       int64_t single_clock_offset_avg;
-       int64_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,
-       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