Move compat macros in 'lttng/align.h' to a private header

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

diff --git a/include/usterr-signal-safe.h b/include/usterr-signal-safe.h
index 478ad1f89bda55f1034bdc2133255c91d97bb3cf..3d6756872fd6943a18ca83149bde06349fb084c8 100644 (file)
--- a/include/usterr-signal-safe.h
+++ b/include/usterr-signal-safe.h
@@ -13,8 +13,9 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <share.h>
+#include <ust-share.h>
 #include "ust-tid.h"
+#include "ust-snprintf.h"
 
 enum ust_loglevel {
        UST_LOGLEVEL_UNKNOWN = 0,
@@ -51,10 +52,6 @@ static inline int ust_debug(void)
 /* We sometimes print in the tracing path, and tracing can occur in
  * signal handlers, so we must use a print method which is signal safe.
  */
-
-extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...)
-       __attribute__ ((format (printf, 3, 4)));
-
 /* 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...)                                        \
@@ -66,7 +63,7 @@ do {                                                                  \
                ____saved_errno = errno;        /* signal-safety */     \
                ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
                ____buf[sizeof(____buf) - 1] = 0;                       \
-               patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
+               ust_patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
                errno = ____saved_errno;        /* signal-safety */     \
                fflush(stderr);                                         \
        }                                                               \