From c4c154d18ef42dc550f2675a9ee88e07b1ca6bed Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 7 Nov 2013 21:05:33 -0800 Subject: Avoid conflicts with Solaris defines that clash with our names When building on Solaris with _XOPEN_SOURCE set to a recent XPG release, and other core headers start including , 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 Reviewed-by: Adam Jackson --- record/record.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'record') 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 */ +#endif + /* These constant are used to index into an array of SetInfoRec. */ enum { REQ, /* set info for requests */ REP, /* set info for replies */ -- cgit v1.2.3