diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-12-05 15:36:12 +0000 |
| commit | a90ee792d96752ad1b71b9ada922fa6afe478c99 (patch) | |
| tree | 6143b00f7646951d23dfe2a4fe2992ca40b77069 /xserver/hw/dmx/dmx_glxvisuals.c | |
| parent | bc97d4ecc0aa9e1b823565b07282f848700bd11a (diff) | |
Upgrade to xorg-server 1.9.2.
Tested by ajacoutot@, krw@, shadchin@ and jasper@ on various configurations
including multihead with both zaphod and xrandr.
Diffstat (limited to 'xserver/hw/dmx/dmx_glxvisuals.c')
| -rw-r--r-- | xserver/hw/dmx/dmx_glxvisuals.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xserver/hw/dmx/dmx_glxvisuals.c b/xserver/hw/dmx/dmx_glxvisuals.c index ec33468be..f0050c283 100644 --- a/xserver/hw/dmx/dmx_glxvisuals.c +++ b/xserver/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 */ @@ -94,7 +94,7 @@ __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy, int screen, int *nconfigs) config = (__GLXvisualConfig*) Xmalloc(nvisuals * sizeof(__GLXvisualConfig)); if (!config) { - Xfree(props); + free(props); UnlockDisplay(dpy); SyncHandle(); return NULL; @@ -228,7 +228,7 @@ __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy, int screen, int *nconfigs) SyncHandle(); *nconfigs = nvisuals; - return( configs ); + return configs; } @@ -284,7 +284,7 @@ __GLXFBConfig *GetGLXFBConfigs(Display *dpy, int glxMajorOpcode, int *nconfigs) config = (__GLXFBConfig*) Xmalloc(numFBConfigs * sizeof(__GLXFBConfig)); if (!config) { - Xfree(attrs); + free(attrs); UnlockDisplay(dpy); SyncHandle(); return NULL; @@ -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; } |