diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
| commit | 52cd3051ba15ddda117f8d8cae1979cd3c86f5b6 (patch) | |
| tree | fbfed14bbfb67daadbff4b0a77b2f6587ffc71d5 /xorg-server/hw | |
| parent | 7a80ea1b5dd2eb54717fdcc427912a9764e7719f (diff) | |
| parent | c043f97a8572e1f509251288d8bcd70d0fb96770 (diff) | |
| download | vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.gz vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.bz2 vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 29 Nov 2013
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/dmx/dmxinit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c index c1e97e0cf..3fd439300 100644 --- a/xorg-server/hw/dmx/dmxinit.c +++ b/xorg-server/hw/dmx/dmxinit.c @@ -612,6 +612,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[]) #ifdef GLXEXT static Bool glxSupported = TRUE; +#else + const Bool glxSupported = FALSE; #endif if (dmxGeneration != serverGeneration) { @@ -740,10 +742,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[]) /* Check if GLX extension exists on all back-end servers */ for (i = 0; i < dmxNumScreens; i++) glxSupported &= (dmxScreens[i].glxMajorOpcode > 0); +#endif if (serverGeneration == 1) dmxAddExtensions(glxSupported); -#endif /* Tell dix layer about the backend displays */ for (i = 0; i < dmxNumScreens; i++) { |