frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'alanc/master'

This commit is contained in:
Keith Packard 2012-12-19 12:17:59 -08:00
parent 014a5c8a9d 9ff2e83151
commit 386e4d76ba
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/dmx/dmxinit.c
View File

@ -740,10 +740,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
/* Check if GLX extension exists on all back-end servers */ /* Check if GLX extension exists on all back-end servers */
for (i = 0; i < dmxNumScreens; i++) for (i = 0; i < dmxNumScreens; i++)
glxSupported &= (dmxScreens[i].glxMajorOpcode > 0); glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
#endif
if (serverGeneration == 1) if (serverGeneration == 1)
dmxAddExtensions(glxSupported); dmxAddExtensions(glxSupported);
#endif
/* Tell dix layer about the backend displays */ /* Tell dix layer about the backend displays */
for (i = 0; i < dmxNumScreens; i++) { for (i = 0; i < dmxNumScreens; i++) {

3
include/dix-config.h.in
View File

@ -429,6 +429,9 @@
/* Define to 1 if typeof works with your compiler. */ /* Define to 1 if typeof works with your compiler. */
#undef HAVE_TYPEOF #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 */ /* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
#undef TLS #undef TLS

9
mi/miinitext.c
View File

@ -212,10 +212,12 @@ EnableDisableExtension(const char *name, Bool enable)
void void
EnableDisableExtensionError(const char *name, Bool enable) EnableDisableExtensionError(const char *name, Bool enable)
{ {
ExtensionToggle *ext = &ExtensionToggleList[0]; ExtensionToggle *ext;
int i;
Bool found = FALSE; 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)) { if ((strcmp(name, ext->name) == 0) && (ext->disablePtr == NULL)) {
ErrorF("[mi] Extension \"%s\" can not be disabled\n", name); ErrorF("[mi] Extension \"%s\" can not be disabled\n", name);
found = TRUE; found = TRUE;
@ -226,7 +228,8 @@ EnableDisableExtensionError(const char *name, Bool enable)
ErrorF("[mi] Extension \"%s\" is not recognized\n", name); ErrorF("[mi] Extension \"%s\" is not recognized\n", name);
ErrorF("[mi] Only the following extensions can be run-time %s:\n", ErrorF("[mi] Only the following extensions can be run-time %s:\n",
enable ? "enabled" : "disabled"); 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) { if (ext->disablePtr != NULL) {
ErrorF("[mi] %s\n", ext->name); ErrorF("[mi] %s\n", ext->name);
} }