xserver: Branch 'master'

[Adam Jackson]

 hw/xwin/glx/indirect.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0a69c1e2fa0ea63b02fff98e68d9f56a369e882b
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Mar 30 18:31:38 2016 +0100

    xwin/glx: Build fix for warnings about missing WGL extensioons
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 5d7ebf5..26832e6 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -634,7 +634,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
         if (strstr(wgl_extensions, "WGL_ARB_make_current_read"))
             screen->has_WGL_ARB_make_current_read = TRUE;
         else
-            LogMessage(X_WARNING, "AIGLX: missing WGL_ARB_make_current_read\n")
+            LogMessage(X_WARNING, "AIGLX: missing WGL_ARB_make_current_read\n");
 
         if (strstr(gl_extensions, "GL_WIN_swap_hint")) {
             __glXEnableExtension(screen->base.glx_enable_bits,
@@ -659,12 +659,12 @@ glxWinScreenProbe(ScreenPtr pScreen)
         if (strstr(wgl_extensions, "WGL_ARB_pbuffer"))
             screen->has_WGL_ARB_pbuffer = TRUE;
         else
-            LogMessage(X_WARNING, "AIGLX: missing WGL_ARB_pbuffer\n")
+            LogMessage(X_WARNING, "AIGLX: missing WGL_ARB_pbuffer\n");
 
         if (strstr(wgl_extensions, "WGL_ARB_multisample"))
             screen->has_WGL_ARB_multisample = TRUE;
         else
-            LogMessage(X_WARNING, "AIGLX: missing WGL_ARB_multisample\n")
+            LogMessage(X_WARNING, "AIGLX: missing WGL_ARB_multisample\n");
 
         screen->base.destroy = glxWinScreenDestroy;
         screen->base.createContext = glxWinCreateContext;