From 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 13 Nov 2013 08:07:38 +0100
Subject: mesa xserver pixman git update 9 nov 2013

xserver          commit 4a251f5883b042cd902c192060a0be2b11148f2b
pixman           commit 8487dfbcd056eff066939dc253fcf361b391592a
mesa             commit e0489531455623aa21aa565b2c890362d8437f23
---
 xorg-server/record/record.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'xorg-server/record/record.c')

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 */
-- 
cgit v1.2.3