Avoid conflicts with Solaris <sys/regset.h> defines that clash with our names
authorAlan Coopersmith <alan.coopersmith@oracle.com>
Fri, 8 Nov 2013 05:05:33 +0000 (21:05 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 12 Nov 2013 12:03:53 +0000 (21:03 +0900)
commitc4c154d18ef42dc550f2675a9ee88e07b1ca6bed
treeb9568902245ab4f4e5f40374b00e026dcd2ca00f
parentd7f9be0f8541368bf1a095ad1fbe7f38be6d3d15
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>
hw/xfree86/x86emu/decode.c
hw/xfree86/x86emu/x86emu/regs.h
hw/xfree86/x86emu/x86emu/x86emui.h
record/record.c