diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
| commit | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (patch) | |
| tree | 91ed73daada51bddd5652fd847f30b3593ecff04 /xorg-server/hw/xfree86/x86emu/decode.c | |
| parent | 6d8fefe38077f4d532c256e79cfcaf2a46c5269d (diff) | |
| parent | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (diff) | |
| download | vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.gz vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.bz2 vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver pixman git update 9 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/Xext/shm.c
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 ----------------------------*/ |