diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-11-07 21:05:33 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-11-12 21:03:53 +0900 |
| commit | c4c154d18ef42dc550f2675a9ee88e07b1ca6bed (patch) | |
| tree | b9568902245ab4f4e5f40374b00e026dcd2ca00f /record | |
| parent | d7f9be0f8541368bf1a095ad1fbe7f38be6d3d15 (diff) | |
Avoid conflicts with Solaris <sys/regset.h> defines that clash with our names
When building on Solaris with _XOPEN_SOURCE set to a recent XPG release,
<stdlib.h> and other core headers start including <sys/regset.h>, which
has a bunch of unfortunately named macros such as "CS", "ES", etc. for
x86 & x64 registers which clash with existing variable & struct member
names in Xorg - so #undef these so they don't interfere with our use.
(Yes, have filed a bug against the system headers for exposing these,
but this solves the problem for building on existing releases.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'record')
| -rw-r--r-- | record/record.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/record/record.c b/record/record.c index f3a26a732..2c70460e8 100644 --- a/record/record.c +++ b/record/record.c @@ -1393,6 +1393,10 @@ typedef struct { short first, last; /* if for extension, major opcode interval */ } SetInfoRec, *SetInfoPtr; +#if defined(ERR) && defined(__sun) +#undef ERR /* Avoid conflict with Solaris <sys/regset.h> */ +#endif + /* These constant are used to index into an array of SetInfoRec. */ enum { REQ, /* set info for requests */ REP, /* set info for replies */ |