xserver: Branch 'master' - 4 commits

[Keith Packard]

 hw/xquartz/pseudoramiX.c |    4 ++--
 hw/xquartz/xpr/dri.h     |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 656e5fea6c9ca15f932889edcc590dd01c881945
Merge: 8b820f2... 1720cd9...
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Jul 12 08:26:35 2012 -0700

    Merge remote-tracking branch 'jeremyhu/master'

commit 1720cd9badf21e5d6b2c6c929e609ab3b0b92fd2
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Jul 11 23:54:27 2012 -0700

    XQuartz: Re-add prototype for DRIExtensionInit
    
    Regression from: a1d41e311c21eb6627caa0d168e070ceaf90806f
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    CC: Daniel Stone <daniel at fooishbar.org>

diff --git a/hw/xquartz/xpr/dri.h b/hw/xquartz/xpr/dri.h
index 7d1c4f2..8717a51 100644
--- a/hw/xquartz/xpr/dri.h
+++ b/hw/xquartz/xpr/dri.h
@@ -72,6 +72,9 @@ DRIFinishScreenInit(ScreenPtr pScreen);
 extern void
 DRICloseScreen(ScreenPtr pScreen);
 
+extern Bool
+DRIExtensionInit(void);
+
 extern void
 DRIReset(void);
 
commit 1a64d3cc9c319d5e9ab2365b60469fb5b83407fc
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Jul 11 23:49:59 2012 -0700

    XQuartz: Fix build failure due to incorrect PseudoramiXExtensionInit prototype
    
    pseudoramiX.c:129:1: error: conflicting types for 'PseudoramiXExtensionInit' [Semantic Issue]
    PseudoramiXExtensionInit(int argc, char *argv[])
    ^
    ../../include/extinit.h:175:13: note: previous declaration is here
    extern void PseudoramiXExtensionInit(void);
                ^
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index a87e8ed..c650dd7 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -126,7 +126,7 @@ PseudoramiXAddScreen(int x, int y, int w, int h)
 // Initialize PseudoramiX.
 // Copied from PanoramiXExtensionInit
 void
-PseudoramiXExtensionInit(int argc, char *argv[])
+PseudoramiXExtensionInit(void)
 {
     Bool success = FALSE;
     ExtensionEntry      *extEntry;
commit 228f8bfe81890770f1ba109a0acca1c81a2ffee9
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Jul 11 23:49:33 2012 -0700

    XQuartz: Silence an unused-variable warning
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index 3e10500..a87e8ed 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -257,7 +257,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
     REQUEST(xPanoramiXGetScreenSizeReq);
     WindowPtr pWin;
     xPanoramiXGetScreenSizeReply rep;
-    register int n, rc;
+    register int rc;
 
     TRACE();