diff options
| author | marha <marha@users.sourceforge.net> | 2013-12-21 14:53:11 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-12-21 14:53:11 +0100 |
| commit | 90077a910e62ec55bc1e5a98f5946754c9c5f8bd (patch) | |
| tree | a480babd4a7c61d52edc2cc555b5d20eab69f737 /xorg-server | |
| parent | 52cd3051ba15ddda117f8d8cae1979cd3c86f5b6 (diff) | |
| download | vcxsrv-90077a910e62ec55bc1e5a98f5946754c9c5f8bd.tar.gz vcxsrv-90077a910e62ec55bc1e5a98f5946754c9c5f8bd.tar.bz2 vcxsrv-90077a910e62ec55bc1e5a98f5946754c9c5f8bd.zip | |
Solved 64-bit run-time problems
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/dix/gc.c | 2 | ||||
| -rw-r--r-- | xorg-server/record/record.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/dix/gc.c b/xorg-server/dix/gc.c index fc13f46a0..57190d11f 100644 --- a/xorg-server/dix/gc.c +++ b/xorg-server/dix/gc.c @@ -127,7 +127,7 @@ ChangeGC(ClientPtr client, GC * pGC, BITS32 mask, ChangeGCValPtr pUnion) PixmapPtr pPixmap; BITS32 maskQ; - assert(pUnion); + assert(pUnion!=NULL); pGC->serialNumber |= GC_CHANGE_SERIAL_BIT; maskQ = mask; /* save these for when we walk the GCque */ diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c index 1b7eb8a43..7a37ec06a 100644 --- a/xorg-server/record/record.c +++ b/xorg-server/record/record.c @@ -2734,7 +2734,7 @@ RecordAClientStateChange(CallbackListPtr *pcbl, pointer nulldata, /* RecordDisableContext modifies contents of ppAllContexts. */ numContextsCopy = numContexts; ppAllContextsCopy = malloc(numContextsCopy * sizeof(RecordContextPtr)); - assert(ppAllContextsCopy); + assert(ppAllContextsCopy!=NULL); memcpy(ppAllContextsCopy, ppAllContexts, numContextsCopy * sizeof(RecordContextPtr)); |