proto/randrproto: Branch 'master' - 2 commits

[Keith Packard]

 randrproto.h |   27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

New commits:
commit 1334866b4aa025bce745140aa0f71f6493408ffa
Merge: ad65017... e719120...
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Dec 9 20:59:47 2008 -0800

    Merge commit 'origin/master'

commit ad6501790bbaff528cf247df24ddb7de27576a11
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Nov 26 15:47:18 2008 -0800

    Remove duplicate GetScreenResourcesCurrent declarations
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/randrproto.h b/randrproto.h
index f8aac94..215bde3 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -567,29 +567,12 @@ typedef struct {
  * Additions for V1.3
  */
 
-typedef struct {
-    CARD8   reqType;
-    CARD8   randrReqType;
-    CARD16  length B16;
-    Window  window B32;
-} xRRGetScreenResourcesCurrentReq;
-#define sz_xRRGetScreenResourcesCurrentReq 8
+typedef xRRGetScreenResourcesReq xRRGetScreenResourcesCurrentReq;
 
-typedef struct {
-    BYTE	type;
-    CARD8	pad;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    Time	timestamp B32;
-    Time	configTimestamp B32;
-    CARD16	nCrtcs B16;
-    CARD16	nOutputs B16;
-    CARD16	nModes B16;
-    CARD16	nbytesNames B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-} xRRGetScreenResourcesCurrentReply;
-#define sz_xRRGetScreenResourcesCurrentReply	32
+#define sz_xRRGetScreenResourcesCurrentReq sz_xRRGetScreenResourcesReq
+
+typedef xRRGetScreenResourcesReply xRRGetScreenResourcesCurrentReply;
+#define sz_xRRGetScreenResourcesCurrentReply	sz_xRRGetScreenResourcesReply
 
 typedef struct {
     CARD8		reqType;