Port: fix 'ERR' conflict with Solaris regset.h
authorMichael Jeanson <mjeanson@efficios.com>
Fri, 16 Oct 2015 14:23:46 +0000 (10:23 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 19 Oct 2015 18:54:22 +0000 (14:54 -0400)
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/common/error.h

index 00519d840c65f20475b61c8b4ab43506728ad754..e0cb1583e4cbf4270605238cfdd35ae0284e271b 100644 (file)
 #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
This page took 0.032547 seconds and 4 git commands to generate.