xserver: Branch 'master' - 2 commits

[Adam Jackson]

 glx/glxdri2.c               |    2 +-
 hw/dmx/input/dmxinputinit.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 500cc4a029efce9b962ab8fbb10da9f87d83372e
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 14 17:21:43 2018 -0500

    dmx: warning fix
    
    /home/ajax/git/xserver/at/../hw/dmx/input/dmxinputinit.c: In function ‘dmxInputInit’:
    /home/ajax/git/xserver/at/../hw/dmx/input/dmxinputinit.c:1019:9: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
             int found;
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index 25c7415b9..04e4f3d92 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -981,6 +981,8 @@ dmxInputInit(DMXInputInfo * dmxInput)
         dmxLogInput(dmxInput, "Using dummy input\n");
     }
     else {
+        int found;
+
         for (i = 1; i < dmxArgC(a); i++) {
             switch (hasXkb) {
             case 1:
@@ -1016,8 +1018,6 @@ dmxInputInit(DMXInputInfo * dmxInput)
             }
         }
 
-        int found;
-
         for (found = 0, i = 0; i < dmxNumScreens; i++) {
             if (dmxPropertySameDisplay(&dmxScreens[i], name)) {
                 if (dmxScreens[i].shared)
commit 9bcddaf9619d01cdbf965cedb9f86a08ed6dc524
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 14 17:20:16 2018 -0500

    dri2: warning fix
    
    /home/ajax/git/xserver/at/../glx/glxdri2.c: In function ‘create_driver_context’:
    /home/ajax/git/xserver/at/../glx/glxdri2.c:444:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
         const __DRIconfig *driConfig = config ? config->driConfig : NULL;
    
    I don't know why autotools has decided not to be C99 but at least it's
    trivial to fix.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 28d5a3a9c..6887e199c 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -440,8 +440,8 @@ create_driver_context(__GLXDRIcontext * context,
                       const uint32_t *attribs,
                       int *error)
 {
-    context->driContext = NULL;
     const __DRIconfig *driConfig = config ? config->driConfig : NULL;
+    context->driContext = NULL;
 
     if (screen->dri2->base.version >= 3) {
         uint32_t ctx_attribs[4 * 2];