X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fusterr-signal-safe.h;h=c75516be4351a536dda0a09fe7ca894cf6166154;hb=38980ed1d67fee8112224294cba927d25dcfd08d;hp=bc68fbf4b2f81a5fc76bc67d492903cbe6f4eb64;hpb=7bdd21a41092a59207958911666cbd458f93a319;p=lttng-ust.git

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index bc68fbf4..c75516be 100644
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -67,11 +67,6 @@ static inline int ust_debug(void)
 extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...)
 	__attribute__ ((format (printf, 3, 4)));
 
-static inline void __attribute__ ((format (printf, 1, 2)))
-	__check_ust_safe_fmt(const char *fmt, ...)
-{
-}
-
 /* Can't use dynamic allocation. Limit ourselves to USTERR_MAX_LEN chars. */
 /* Add end of string in case of buffer overflow. */
 #define sigsafe_print_err(fmt, args...)					\
@@ -95,7 +90,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) lttng_gettid(),		\
 		## args, __func__);		\
 	} while(0)
 
@@ -106,7 +101,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))
+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
 /*
  * Version using XSI strerror_r.
  */