diff options
Diffstat (limited to 'xorg-server/hw/xfree86/x86emu/x86emu/x86emui.h')
| -rw-r--r-- | xorg-server/hw/xfree86/x86emu/x86emu/x86emui.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/x86emu/x86emu/x86emui.h b/xorg-server/hw/xfree86/x86emu/x86emu/x86emui.h index f11dc102f..5e20d9705 100644 --- a/xorg-server/hw/xfree86/x86emu/x86emu/x86emui.h +++ b/xorg-server/hw/xfree86/x86emu/x86emu/x86emui.h @@ -73,7 +73,17 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#endif +/* avoid conflicts with Solaris sys/regset.h */ +# if defined(__sun) && defined(CS) +# undef CS +# undef DS +# undef SS +# undef ES +# undef FS +# undef GS +# endif +#endif /* NO_SYS_HEADERS */ + /*--------------------------- Inline Functions ----------------------------*/ #ifdef __cplusplus |