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/dix | |
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/dix')
-rw-r--r-- | nx-X11/programs/Xserver/dix/dixfonts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index b66fe23bd..193f5558c 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -2203,7 +2203,7 @@ dump_char_ascii(CharInfoPtr cip) byte = 0; for (l = 0; l <= (cip->metrics.rightSideBearing - cip->metrics.leftSideBearing); l++) { - if (maskTab[l & 7] & row[l >> 3]) + if (maskTab[l & 7] & (((int*)row)[l >> 3])) putchar('X'); else putchar('.'); |