From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 16 Oct 2015 14:23:46 +0000 (-0400)
Subject: Port: fix 'ERR' conflict with Solaris regset.h
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=1e9e234a9f9c031212a795eff518ff7516de7586

Port: fix 'ERR' conflict with Solaris regset.h

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

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