Remove inappropriate \n from easy-ust sample

[lttng-ust.git] / include / usterr-signal-safe.h

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index 8e2c1cd2413ed748dd781f5d797e56bb52942d13..375eff7c569b63d5794a6cc7932de4da81548499 100644 (file)
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -26,8 +26,8 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+
 #include <share.h>
-#include "lttng/ust-tid.h"
 
 enum ust_loglevel {
        UST_LOGLEVEL_UNKNOWN = 0,
@@ -85,7 +85,7 @@ do {                                                                  \
        do {                                    \
                sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n",    \
                (long) getpid(),                \
-               (long) gettid(),                \
+               (long) syscall(SYS_gettid),     \
                ## args, __func__);             \
                fflush(stderr);                 \
        } while(0)
@@ -115,10 +115,7 @@ do {                                                                       \
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
 #define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
 
-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
-/*
- * Version using XSI strerror_r.
- */
+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)
 #define PERROR(call, args...)\
        do { \
                char buf[200] = "Error in strerror_r()"; \
@@ -126,9 +123,6 @@ do {                                                                        \
                ERRMSG("Error: " call ": %s", ## args, buf); \
        } while(0);
 #else
-/*
- * Version using GNU strerror_r, for linux with appropriate defines.
- */
 #define PERROR(call, args...)\
        do { \
                char *buf; \