xserver: Branch 'master' - 2 commits

[Adam Jackson]

 glx/glxcmds.c      |    2 +-
 glx/glxdriswrast.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c967e4cd8ba50034b6e02d87df10d04edf15ccf6
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Mon Jul 31 14:06:48 2017 +0100

    glx: don't export __glXDRISWRastProvider
    
    The symbol is used only internally and is not part of the API/ABI.
    
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 396b68911..251bdd2dd 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -477,7 +477,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-_X_EXPORT __GLXprovider __glXDRISWRastProvider = {
+__GLXprovider __glXDRISWRastProvider = {
     __glXDRIscreenProbe,
     "DRISWRAST",
     NULL
commit c09e906d61a0855a8202e58ba72ed6bb3b08f37f
Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Mon Jul 31 14:06:47 2017 +0100

    glx: fix typo becuase -> because
    
    Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index ac21136b1..9ad90eec2 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -224,7 +224,7 @@ __glXdirectContextCreate(__GLXscreen * screen,
 /**
  * Create a GL context with the given properties.  This routine is used
  * to implement \c glXCreateContext, \c glXCreateNewContext, and
- * \c glXCreateContextWithConfigSGIX.  This works becuase of the hack way
+ * \c glXCreateContextWithConfigSGIX.  This works because of the hack way
  * that GLXFBConfigs are implemented.  Basically, the FBConfigID is the
  * same as the VisualID.
  */