X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fusterr-signal-safe.h;h=fbe1987c7df271314bb639e5e735bcb369b7a9af;hb=88950450f2a3d598bfdd6226351a2a8775ca1514;hp=d46b0f6a7af8929fbd9296dfc3bf29d37bdf179d;hpb=49c0da7df5e7bd32c06d69822e9b92120bf4d392;p=lttng-ust.git

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index d46b0f6a..fbe1987c 100644
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -22,11 +22,11 @@
 
 #include <string.h>
 #include <sys/types.h>
-#include <sys/syscall.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <share.h>
+#include <urcu/compiler.h>
 #include "lttng/ust-tid.h"
 
 enum ust_loglevel {
@@ -115,7 +115,10 @@ do {									\
 #define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
 #define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
 
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)
+#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+/*
+ * Version using XSI strerror_r.
+ */
 #define PERROR(call, args...)\
 	do { \
 		char buf[200] = "Error in strerror_r()"; \
@@ -123,6 +126,9 @@ 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; \