summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dix/main.c1
-rw-r--r--include/scrnintstr.h2
-rw-r--r--test/xi2/protocol-common.c1
-rw-r--r--test/xtest.c1
4 files changed, 1 insertions, 4 deletions
diff --git a/dix/main.c b/dix/main.c
index f0235364f..e5667a611 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -190,7 +190,6 @@ int main(int argc, char *argv[], char *envp[])
FatalError("couldn't init server resources");
SetInputCheck(&alwaysCheckForInput[0], &alwaysCheckForInput[1]);
- screenInfo.arraySize = MAXSCREENS;
screenInfo.numScreens = 0;
InitAtoms();
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index c42119d0d..5a7c57d83 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -615,7 +615,7 @@ typedef struct _ScreenInfo {
int numPixmapFormats;
PixmapFormatRec
formats[MAXFORMATS];
- int arraySize;
+ int unused2;
int numScreens;
ScreenPtr screens[MAXSCREENS];
int unused;
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 2dff1ad6a..0afa55a40 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -141,7 +141,6 @@ static Bool device_cursor_init(DeviceIntPtr dev, ScreenPtr screen) { return TRUE
static Bool set_cursor_pos(DeviceIntPtr dev, ScreenPtr screen, int x, int y, Bool event) { return TRUE; }
void init_simple(void)
{
- screenInfo.arraySize = MAXSCREENS;
screenInfo.numScreens = 1;
screenInfo.screens[0] = &screen;
diff --git a/test/xtest.c b/test/xtest.c
index 572f5d2df..cc1188d7d 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -49,7 +49,6 @@ static void xtest_init_devices(void)
/* random stuff that needs initialization */
memset(&screen, 0, sizeof(screen));
- screenInfo.arraySize = MAXSCREENS;
screenInfo.numScreens = 1;
screenInfo.screens[0] = &screen;
screen.myNum = 0;