From 107a99aba36e6e51d9851dd0ddb3b71e7b2bbd6a Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 28 Jan 2011 13:11:47 +0000 Subject: Solved compilation errors --- xorg-server/miext/rootless/makefile | 7 ++++--- xorg-server/miext/rootless/rootlessWindow.c | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xorg-server/miext/rootless/makefile b/xorg-server/miext/rootless/makefile index 4ad30b75e..d49e810a2 100644 --- a/xorg-server/miext/rootless/makefile +++ b/xorg-server/miext/rootless/makefile @@ -1,9 +1,10 @@ LIBRARY=librootless -CSRCS = \ +librootless_la_SOURCES = \ rootlessCommon.c \ rootlessGC.c \ rootlessScreen.c \ - rootlessValTree.c -# rootlessWindow.c + rootlessValTree.c \ + rootlessWindow.c +CSRCS = $(filter %.c,$(librootless_la_SOURCES)) diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index ef0d42e4c..4c7f7b044 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -1002,6 +1002,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity, } else if (gravity) { /* The general case. Just copy everything. */ + BoxRec tmpBoxRec={oldX, oldY, oldX2, oldY2}; RootlessStartDrawing(pWin); @@ -1010,7 +1011,7 @@ StartFrameResize(WindowPtr pWin, Bool gravity, memcpy(gResizeDeathBits, winRec->pixelData, winRec->bytesPerRow * winRec->height); - gResizeDeathBounds[0] = (BoxRec) {oldX, oldY, oldX2, oldY2}; + gResizeDeathBounds[0] = tmpBoxRec; gResizeDeathPix[0] = GetScratchPixmapHeader(pScreen, winRec->width, winRec->height, @@ -1047,7 +1048,8 @@ StartFrameResize(WindowPtr pWin, Bool gravity, window bits. */ if (need_window_source) { - gResizeDeathBounds[0] = (BoxRec) {oldX, oldY, oldX2, oldY2}; + BoxRec tmpBoxRec={oldX, oldY, oldX2, oldY2}; + gResizeDeathBounds[0] = tmpBoxRec; gResizeDeathPix[0] = GetScratchPixmapHeader(pScreen, oldW, oldH, winRec->win->drawable.depth, -- cgit v1.2.3