X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=d072b00c804cb129b0b87b47410d43b75ade6499;hb=017429025b3f27b7fdbd931a30f310869479f66e;hp=00519d840c65f20475b61c8b4ab43506728ad754;hpb=7d9ad8800792b112461e469d774a0abb5ff06043;p=lttng-tools.git

diff --git a/src/common/error.h b/src/common/error.h
index 00519d840..d072b00c8 100644
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -32,6 +32,11 @@
 #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
@@ -80,9 +85,8 @@ extern int lttng_opt_mi;
 				((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);