diff options
Diffstat (limited to 'xorg-server/hw/xfree86/x86emu/decode.c')
| -rw-r--r-- | xorg-server/hw/xfree86/x86emu/decode.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/x86emu/decode.c b/xorg-server/hw/xfree86/x86emu/decode.c index 12f8fb84b..08a07b1bb 100644 --- a/xorg-server/hw/xfree86/x86emu/decode.c +++ b/xorg-server/hw/xfree86/x86emu/decode.c @@ -38,6 +38,16 @@ ****************************************************************************/ #include <stdlib.h> + +#if defined(__sun) && defined(CS) /* avoid conflicts with Solaris sys/regset.h */ +# undef CS +# undef DS +# undef SS +# undef ES +# undef FS +# undef GS +#endif + #include "x86emu/x86emui.h" /*----------------------------- Implementation ----------------------------*/ |