aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/dmxcb.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-24 07:37:29 +0000
committermarha <marha@users.sourceforge.net>2011-03-24 07:37:29 +0000
commitb39f063f74bf0163eaf34db03134f226d18142ec (patch)
treebf7f3736a65e74d20d63cc9f9938d9006dc2a1fe /xorg-server/hw/dmx/dmxcb.c
parenteca5dee9e7a8dea1edba4d10b60444ac0e884139 (diff)
downloadvcxsrv-b39f063f74bf0163eaf34db03134f226d18142ec.tar.gz
vcxsrv-b39f063f74bf0163eaf34db03134f226d18142ec.tar.bz2
vcxsrv-b39f063f74bf0163eaf34db03134f226d18142ec.zip
xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011
Diffstat (limited to 'xorg-server/hw/dmx/dmxcb.c')
-rw-r--r--xorg-server/hw/dmx/dmxcb.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/hw/dmx/dmxcb.c b/xorg-server/hw/dmx/dmxcb.c
index 4e7279a51..d0eb35117 100644
--- a/xorg-server/hw/dmx/dmxcb.c
+++ b/xorg-server/hw/dmx/dmxcb.c
@@ -46,6 +46,7 @@
extern int connBlockScreenStart;
#ifdef PANORAMIX
+#include "panoramiXsrv.h"
extern int PanoramiXPixWidth;
extern int PanoramiXPixHeight;
extern int PanoramiXNumScreens;
@@ -137,7 +138,7 @@ void dmxConnectionBlockCallback(void)
}
dmxLog(dmxInfo, "%d screens configured with Xinerama (%d %d)\n",
PanoramiXNumScreens, PanoramiXPixWidth, PanoramiXPixHeight);
- for (i = 0; i < PanoramiXNumScreens; i++) found[i] = FALSE;
+ FOR_NSCREENS(i) found[i] = FALSE;
} else {
#endif
/* This never happens because we're
@@ -177,7 +178,7 @@ void dmxConnectionBlockCallback(void)
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
int k;
- for (k = 0; k < PanoramiXNumScreens; k++) {
+ FOR_NSCREENS(k) {
DMXScreenInfo *dmxScreen = &dmxScreens[k];
if (dmxScreen->beDisplay) {
@@ -203,7 +204,7 @@ void dmxConnectionBlockCallback(void)
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
Bool fatal = FALSE;
- for (i = 0; i < PanoramiXNumScreens; i++) {
+ FOR_NSCREENS(i) {
fatal |= !found[i];
if (!found[i]) {
dmxLog(dmxError,