Merge remote-tracking branch 'alanc/master'
This commit is contained in:
commit
386e4d76ba
|
@ -740,10 +740,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++) {
|
||||
|
|
|
@ -429,6 +429,9 @@
|
|||
/* Define to 1 if typeof works with your compiler. */
|
||||
#undef HAVE_TYPEOF
|
||||
|
||||
/* Define to __typeof__ if your compiler spells it that way. */
|
||||
#undef typeof
|
||||
|
||||
/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
|
||||
#undef TLS
|
||||
|
||||
|
|
|
@ -212,10 +212,12 @@ EnableDisableExtension(const char *name, Bool enable)
|
|||
void
|
||||
EnableDisableExtensionError(const char *name, Bool enable)
|
||||
{
|
||||
ExtensionToggle *ext = &ExtensionToggleList[0];
|
||||
ExtensionToggle *ext;
|
||||
int i;
|
||||
Bool found = FALSE;
|
||||
|
||||
for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) {
|
||||
for (i = 0; i < ARRAY_SIZE(ExtensionToggleList); i++) {
|
||||
ext = &ExtensionToggleList[i];
|
||||
if ((strcmp(name, ext->name) == 0) && (ext->disablePtr == NULL)) {
|
||||
ErrorF("[mi] Extension \"%s\" can not be disabled\n", name);
|
||||
found = TRUE;
|
||||
|
@ -226,7 +228,8 @@ EnableDisableExtensionError(const char *name, Bool enable)
|
|||
ErrorF("[mi] Extension \"%s\" is not recognized\n", name);
|
||||
ErrorF("[mi] Only the following extensions can be run-time %s:\n",
|
||||
enable ? "enabled" : "disabled");
|
||||
for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) {
|
||||
for (i = 0; i < ARRAY_SIZE(ExtensionToggleList); i++) {
|
||||
ext = &ExtensionToggleList[i];
|
||||
if (ext->disablePtr != NULL) {
|
||||
ErrorF("[mi] %s\n", ext->name);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user