diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-02-13 13:41:31 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-13 13:41:31 +0100 |
| commit | 6e662473126d0668493732ece7e3c3bb1b0ea72c (patch) | |
| tree | c857c6b64a7bb03b4c54625479de4b2df2953c8c /nx-X11/programs/Xserver/hw/nxagent/Render.c | |
| parent | a8fb7d4f5149e28216ffd38838af1cbfd6527002 (diff) | |
| download | nx-libs-6e662473126d0668493732ece7e3c3bb1b0ea72c.tar.gz nx-libs-6e662473126d0668493732ece7e3c3bb1b0ea72c.tar.bz2 nx-libs-6e662473126d0668493732ece7e3c3bb1b0ea72c.zip | |
Several fixes for building debug versions of NX (990_fix-DEBUG-and-TEST-builds.full.patch).
(1) In nx-X11/programs/Xserver/dix:
Fix several compile errors when specifying -DDEBUG globally. Previous GCC
versions were more liberal and the code thus compiled.
Also initialize/reset a count variable correctly.
(2) In nx-X11/programs/Xserver/hw/nxagent/Render.c:
Check for pSrc->pDrawable to exist instead of having nxagent segfault when
it does not.
This enables the possibility of compiling all nxagent modules in TEST mode.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Render.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 41a1ec02e..c5fd06352 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -1678,10 +1678,11 @@ FIXME: Is this useful or just a waste of bandwidth? #ifdef TEST - fprintf(stderr, "nxagentTrapezoids: Source is a [%s] of geometry [%d,%d].\n", - (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), - pSrc -> pDrawable -> width, pSrc -> pDrawable -> height); - + if (pSrc->pDrawable) { + fprintf(stderr, "nxagentTrapezoids: Source is a [%s] of geometry [%d,%d].\n", + (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP ? "pixmap" : "window"), + pSrc -> pDrawable -> width, pSrc -> pDrawable -> height); + } if (pSrc ->pDrawable != pDst -> pDrawable) { fprintf(stderr, "nxagentTrapezoids: Destination is a [%s] of geometry [%d,%d].\n", |