diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-13 08:07:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-13 08:07:38 +0100 |
| commit | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (patch) | |
| tree | 064121d82e7edce83e6d4809d6e4a92b1a3e84d6 /xorg-server/hw/xfree86/x86emu/decode.c | |
| parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
| download | vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.tar.gz vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.tar.bz2 vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.zip | |
mesa xserver pixman git update 9 nov 2013
xserver commit 4a251f5883b042cd902c192060a0be2b11148f2b
pixman commit 8487dfbcd056eff066939dc253fcf361b391592a
mesa commit e0489531455623aa21aa565b2c890362d8437f23
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 ----------------------------*/ |