On Thu, Apr 22, 2010 at 11:15:39AM -0700, Tiago Vignatti wrote:
> Bizarre. This seems to never be used before.
>
> Signed-off-by: Tiago Vignatti <[email protected]>
> ---
> dix/main.c | 1 -
> include/scrnintstr.h | 1 -
> test/xi2/protocol-common.c | 1 -
> test/xtest.c | 1 -
> 4 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/dix/main.c b/dix/main.c
> index f023536..e5667a6 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 c42119d..4c7a879 100644
> --- a/include/scrnintstr.h
> +++ b/include/scrnintstr.h
> @@ -615,7 +615,6 @@ typedef struct _ScreenInfo {
> int numPixmapFormats;
> PixmapFormatRec
> formats[MAXFORMATS];
> - int arraySize;
This breaks the ABI again. Could you please either bump the ABI numbers in
hw/xfree86/common/xf86Module.h and remove the 'int unused' field below or
(preferably) just rename the field to "unused2"?
> int numScreens;
> ScreenPtr screens[MAXSCREENS];
> int unused;
> diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
> index 2dff1ad..0afa55a 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 572f5d2..cc1188d 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;
> --
> 1.6.0.4
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
