open-src/xserver/xorg/record-regset.patch
author henryzh <henry.zhao@oracle.com>
Wed, 30 Jul 2014 17:12:53 -0700
changeset 1464 5ae7d5f1ccc6
parent 1340 6585ca03b32d
permissions -rw-r--r--
19212677 Multi-session doesn't work properly when invoked with "-isolateDevice" option
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1124
7bc7e624f965 7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1088
diff changeset
     1
diff --git a/record/record.c b/record/record.c
1340
6585ca03b32d 16027382 Update to Xorg 1.13.1 & xf86-video-mach64 6.9.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1276
diff changeset
     2
index f3a26a7..6d79de4 100644
1124
7bc7e624f965 7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1088
diff changeset
     3
--- a/record/record.c
7bc7e624f965 7042476 Xorg 1.10 & associated module updates [PSARC/2011/214]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1088
diff changeset
     4
+++ b/record/record.c
1340
6585ca03b32d 16027382 Update to Xorg 1.13.1 & xf86-video-mach64 6.9.4
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1276
diff changeset
     5
@@ -1393,6 +1393,9 @@ typedef struct {
1276
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
     6
     short first, last;          /* if for extension, major opcode interval */
1088
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     7
 } SetInfoRec, *SetInfoPtr;
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     8
 
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
     9
+#undef ERR /* protect against #define ERR in <sys/regset.h> on Solaris x86,
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    10
+	      which gets included indirectly via #include <stdlib.h> */
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    11
+
1c99106ccbe0 6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset
    12
 /* These constant are used to index into an array of SetInfoRec. */
1276
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    13
 enum { REQ,                     /* set info for requests */
52f85727ce94 7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1265
diff changeset
    14
     REP,                        /* set info for replies */