projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Port: fix 'ERR' conflict with Solaris regset.h
[lttng-tools.git]
/
src
/
common
/
error.h
diff --git
a/src/common/error.h
b/src/common/error.h
index 00519d840c65f20475b61c8b4ab43506728ad754..e0cb1583e4cbf4270605238cfdd35ae0284e271b 100644
(file)
--- a/
src/common/error.h
+++ b/
src/common/error.h
@@
-32,6
+32,11
@@
#include <lttng/lttng-error.h>
#include <common/compat/tid.h>
#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
/* Stringify the expansion of a define */
#define XSTR(d) STR(d)
#define STR(s) #s
This page took
0.024104 seconds
and
4
git commands to generate.