open-src/xserver/xorg/record-regset.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Fri, 06 Apr 2012 21:57:14 -0700
changeset 1265 0b5cc5c013e4
parent 1124 7bc7e624f965
child 1276 52f85727ce94
permissions -rw-r--r--
7083537 Xorg 1.12 & associated module updates

diff --git a/record/record.c b/record/record.c
index b956b4a..d0604e0 100644
--- a/record/record.c
+++ b/record/record.c
@@ -1475,6 +1475,9 @@ typedef struct
     short first, last;	/* if for extension, major opcode interval */
 } SetInfoRec, *SetInfoPtr;
 
+#undef ERR /* protect against #define ERR in <sys/regset.h> on Solaris x86,
+	      which gets included indirectly via #include <stdlib.h> */
+
 /* These constant are used to index into an array of SetInfoRec. */
 enum {REQ,	/* set info for requests */
       REP,	/* set info for replies */