From 1f876171067c04fc21fccd5a3051f982fd85c0f0 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 21 Oct 2009 19:07:36 +0000 Subject: Updated to xorg-server-1.7.99.1 --- xorg-server/hw/dmx/dmxwindow.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xorg-server/hw/dmx/dmxwindow.c') diff --git a/xorg-server/hw/dmx/dmxwindow.c b/xorg-server/hw/dmx/dmxwindow.c index 24acc08e3..f9e46db1e 100644 --- a/xorg-server/hw/dmx/dmxwindow.c +++ b/xorg-server/hw/dmx/dmxwindow.c @@ -116,7 +116,7 @@ Window dmxCreateRootWindow(WindowPtr pWindow) } /** Change the location and size of the "screen" window. Called from - * #dmxReconfigureScreenWindow(). */ + * #dmxConfigureScreenWindow(). */ void dmxResizeScreenWindow(ScreenPtr pScreen, int x, int y, int w, int h) { @@ -139,7 +139,7 @@ void dmxResizeScreenWindow(ScreenPtr pScreen, } /** Change the location and size of the "root" window. Called from - * #dmxReconfigureRootWindow(). */ + * #dmxConfigureRootWindow. */ void dmxResizeRootWindow(WindowPtr pRoot, int x, int y, int w, int h) { @@ -419,10 +419,9 @@ Bool dmxDestroyWindow(WindowPtr pWindow) pWinPriv->windowDestroyed(pWindow); #endif -#if 0 if (pScreen->DestroyWindow) ret = pScreen->DestroyWindow(pWindow); -#endif + DMX_WRAP(DestroyWindow, dmxDestroyWindow, dmxScreen, pScreen); return ret; -- cgit v1.2.3