#include <lttng/lttng-error.h>
#include <common/compat/tid.h>
+/* Avoid conflict with Solaris <sys/regset.h> */
+#if defined(ERR) && defined(__sun__)
+#undef ERR
+#endif
+
/* Stringify the expansion of a define */
#define XSTR(d) STR(d)
#define STR(s) #s
((type & (PRINT_DBG | PRINT_DBG2 | PRINT_DBG3)) && \
lttng_opt_verbose == 3))) { \
fprintf(stderr, fmt, ## args); \
- } else if (lttng_opt_quiet == 0 && (type & (PRINT_WARN))) { \
- fprintf(stderr, fmt, ## args); \
- } else if (type & (PRINT_ERR | PRINT_BUG)) { \
+ } else if (lttng_opt_quiet == 0 && \
+ (type & (PRINT_WARN | PRINT_ERR | PRINT_BUG))) { \
fprintf(stderr, fmt, ## args); \
} \
} while (0);