From 90077a910e62ec55bc1e5a98f5946754c9c5f8bd Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 21 Dec 2013 14:53:11 +0100 Subject: Solved 64-bit run-time problems --- xorg-server/dix/gc.c | 2 +- xorg-server/record/record.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xorg-server') 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)); -- cgit v1.2.3