diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-09-18 01:23:12 +0200 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2011-09-18 20:11:43 -0500 |
| commit | 53a4744b69ab76ecabdde5dabfb56830570c0f4e (patch) | |
| tree | 60a2a592980aa4c88e5f2def4406cc3cfe478ad2 | |
| parent | b85c10a35d44ad695797d0d19757e5f62eab4b98 (diff) | |
XineramaInitData ignores its argument. Quit passing one.
Also fix up XineramaInitData's caller, XineramaReinitData.
Commit by Jamey Sharp and Josh Triplett.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Xext/panoramiX.c | 12 | ||||
| -rw-r--r-- | Xext/panoramiXsrv.h | 2 | ||||
| -rw-r--r-- | hw/dmx/dmxextension.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 00afe94f1..425c10ce4 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -388,7 +388,7 @@ XineramaRegisterConnectionBlockCallback(void (*func)(void)) return TRUE; } -static void XineramaInitData(ScreenPtr pScreen) +static void XineramaInitData(void) { int i, w, h; @@ -397,7 +397,7 @@ static void XineramaInitData(ScreenPtr pScreen) BoxRec TheBox; RegionRec ScreenRegion; - pScreen = screenInfo.screens[i]; + ScreenPtr pScreen = screenInfo.screens[i]; TheBox.x1 = pScreen->x; TheBox.x2 = TheBox.x1 + pScreen->width; @@ -414,7 +414,7 @@ static void XineramaInitData(ScreenPtr pScreen) PanoramiXPixHeight = screenInfo.screens[0]->y + screenInfo.screens[0]->height; FOR_NSCREENS_FORWARD_SKIP(i) { - pScreen = screenInfo.screens[i]; + ScreenPtr pScreen = screenInfo.screens[i]; w = pScreen->x + pScreen->width; h = pScreen->y + pScreen->height; @@ -425,10 +425,10 @@ static void XineramaInitData(ScreenPtr pScreen) } } -void XineramaReinitData(ScreenPtr pScreen) +void XineramaReinitData(void) { RegionUninit(&PanoramiXScreenRegion); - XineramaInitData(pScreen); + XineramaInitData(); } /* @@ -525,7 +525,7 @@ void PanoramiXExtensionInit(int argc, char *argv[]) return; } - XineramaInitData(pScreen); + XineramaInitData(); /* * Put our processes into the ProcVector diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index 6fc903b88..39d495203 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -19,7 +19,7 @@ extern _X_EXPORT PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int); extern _X_EXPORT Bool XineramaRegisterConnectionBlockCallback(void (*func)(void)); extern _X_EXPORT int XineramaDeleteResource(pointer, XID); -extern _X_EXPORT void XineramaReinitData(ScreenPtr); +extern _X_EXPORT void XineramaReinitData(void); extern _X_EXPORT RESTYPE XRC_DRAWABLE; extern _X_EXPORT RESTYPE XRT_WINDOW; diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c index db5709ee6..80d11ee89 100644 --- a/hw/dmx/dmxextension.c +++ b/hw/dmx/dmxextension.c @@ -455,7 +455,7 @@ static void dmxSetRootWindowOrigin(int idx, int x, int y) pScreen->y = dmxScreen->rootYOrigin; /* Recalculate the Xinerama regions and data structs */ - XineramaReinitData(pScreen); + XineramaReinitData(); /* Adjust each of the root window's children */ if (!idx) ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff); |