xserver: Branch 'master' - 2 commits

[Adam Jackson]

 hw/dmx/glxProxy/glxcmdsswap.c      |    2 +-
 hw/xfree86/os-support/xf86_OSlib.h |    4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e8e3368298c98a1292bb1c727e2f3d56539e2eac
Author: Felix Janda <felix.janda at posteo.de>
Date:   Mon Aug 17 20:25:53 2015 +0200

    On linux use <termios.h> instead of <termio.h>
    
    <termio.h> is obsolete. Using <termios.h> instead fixes building with
    musl libc.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Felix Janda <felix.janda at posteo.de>

diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 6190fe6..95c3a73 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -183,11 +183,7 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
 #include <sys/types.h>
 #include <assert.h>
 
-#ifdef __linux__
-#include <termio.h>
-#else                           /* __GLIBC__ */
 #include <termios.h>
-#endif
 #ifdef __sparc__
 #include <sys/param.h>
 #endif
commit dfa8b37cfb2589f2474f6fcc755dde77bfdd6fed
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jul 29 11:30:15 2015 -0400

    glxproxy: Fix an obvious thinko in QueryExtensionsString
    
    gcc 5.1 throws a rather amusing warning here:
    
    glxcmdsswap.c: In function ‘__glXSwapQueryExtensionsString’:
    glxcmdsswap.c:439:1: warning: function might be candidate for attribute
    ‘noreturn’ [-Wsuggest-attribute=noreturn]
     __glXSwapQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
    
    This is entirely accurate, albeit curiously phrased: swapping some bits
    hanging off the end of a null pointer will make Xdmx crash, so from the
    perspective of code generation the function will indeed not return.
    
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
index 600a6e1..5b1722d 100644
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@@ -438,7 +438,7 @@ __glXSwapUseXFont(__GLXclientState * cl, GLbyte * pc)
 int
 __glXSwapQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
 {
-    xGLXQueryExtensionsStringReq *req = NULL;
+    xGLXQueryExtensionsStringReq *req = (xGLXQueryExtensionsStringReq *) pc;
 
     __GLX_DECLARE_SWAP_VARIABLES;