aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/record/record.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-13 08:07:38 +0100
committermarha <marha@users.sourceforge.net>2013-11-13 08:07:38 +0100
commit8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (patch)
tree064121d82e7edce83e6d4809d6e4a92b1a3e84d6 /xorg-server/record/record.c
parent4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff)
downloadvcxsrv-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/record/record.c')
-rw-r--r--xorg-server/record/record.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c
index f3a26a732..2c70460e8 100644
--- a/xorg-server/record/record.c
+++ b/xorg-server/record/record.c
@@ -1393,6 +1393,10 @@ typedef struct {
short first, last; /* if for extension, major opcode interval */
} SetInfoRec, *SetInfoPtr;
+#if defined(ERR) && defined(__sun)
+#undef ERR /* Avoid conflict with Solaris <sys/regset.h> */
+#endif
+
/* These constant are used to index into an array of SetInfoRec. */
enum { REQ, /* set info for requests */
REP, /* set info for replies */