svn merge ^/branches/released .

1 files changed, 4 insertions, 4 deletions

diff --git a/xorg-server/hw/dmx/dmx_glxvisuals.c b/xorg-server/hw/dmx/dmx_glxvisuals.c
index 50a23e30f..dd77bd23a 100644
--- a/xorg-server/hw/dmx/dmx_glxvisuals.c
+++ b/xorg-server/hw/dmx/dmx_glxvisuals.c
@@ -51,7 +51,7 @@ __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy, int screen, int *nconfigs)
     int   num_good_visuals;

 

     if (!XQueryExtension(dpy, "GLX", &majorOpcode, &dummy, &dummy)) {

-       return(NULL);

+       return NULL;

     }

 

     /* Send the glXGetVisualConfigs request */

@@ -228,7 +228,7 @@ __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy, int screen, int *nconfigs)
     SyncHandle();

 

     *nconfigs = nvisuals;

-    return( configs );

+    return configs;

 }

 

 

@@ -500,7 +500,7 @@ GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, int nfbconfigs,
     __GLXvisualConfig *configs = NULL;

     int i;

     

-    if (!fbconfigs || !nfbconfigs || !nconfigs) return(NULL);

+    if (!fbconfigs || !nfbconfigs || !nconfigs) return NULL;

     *nconfigs = 0;

 

     /* Allocate memory for our config structure */

@@ -596,6 +596,6 @@ GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, int nfbconfigs,
        }

     }

 

-    return( configs );

+    return configs;

 }