X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.h;h=e0cb1583e4cbf4270605238cfdd35ae0284e271b;hp=00519d840c65f20475b61c8b4ab43506728ad754;hb=0c82ac624169ec9ec062f395e55abfe992d0fd91;hpb=7d9ad8800792b112461e469d774a0abb5ff06043

diff --git a/src/common/error.h b/src/common/error.h
index 00519d840..e0cb1583e 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