diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2015-10-18 23:12:51 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-10-19 11:52:03 -0400 |
| commit | 0a5d54f721de7e3ab3b6f4b080190a92bbe3429b (patch) | |
| tree | 17099f242856ec9fdb02ea216634050aa6622845 | |
| parent | e09875701b980b8c4578fb310a922c9934c34eef (diff) | |
dix: Silence -Wunused-variable warning by moving window.c off of legacy region defines
window.c:223:15: warning: unused variable 'pScreen' [-Wunused-variable,Unused Entity Issue]
ScreenPtr pScreen = pWin->drawable.pScreen;
^
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
| -rw-r--r-- | dix/window.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dix/window.c b/dix/window.c index d57f320f8..69b5a7cf5 100644 --- a/dix/window.c +++ b/dix/window.c @@ -220,7 +220,6 @@ log_window_info(WindowPtr pWin, int depth) int i; const char *win_name, *visibility; BoxPtr rects; - ScreenPtr pScreen = pWin->drawable.pScreen; for (i = 0; i < (depth << 2); i++) ErrorF(" "); @@ -240,7 +239,7 @@ log_window_info(WindowPtr pWin, int depth) ErrorF(" (%s compositing: pixmap %x)", (pWin->redirectDraw == RedirectDrawAutomatic) ? "automatic" : "manual", - (unsigned) pScreen->GetWindowPixmap(pWin)->drawable.id); + (unsigned) pWin->drawable.pScreen->GetWindowPixmap(pWin)->drawable.id); #endif switch (pWin->visibility) { @@ -259,10 +258,10 @@ log_window_info(WindowPtr pWin, int depth) } ErrorF(", %s", visibility); - if (REGION_NOTEMPTY(pScreen, &pWin->clipList)) { + if (RegionNotEmpty(&pWin->clipList)) { ErrorF(", clip list:"); - rects = REGION_RECTS(&pWin->clipList); - for (i = 0; i < REGION_NUM_RECTS(&pWin->clipList); i++) + rects = RegionRects(&pWin->clipList); + for (i = 0; i < RegionNumRects(&pWin->clipList); i++) ErrorF(" [(%d, %d) to (%d, %d)]", rects[i].x1, rects[i].y1, rects[i].x2, rects[i].y2); ErrorF("; extents [(%d, %d) to (%d, %d)]", |