diff options
| author | Kevin E Martin <kem@kem.org> | 2004-07-29 23:43:40 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-07-29 23:43:40 +0000 |
| commit | 813d75f9d3c7b540977926e37310fa683daf12e1 (patch) | |
| tree | 00c2764950a672f62f4919fe57d5d613b325feb7 /dix | |
| parent | 274d5044ac41523ff23912c223177c429c710e09 (diff) | |
Use LibraryTargetName when not building a loadable server
Move extern function declarations to window.h
Cleaned up code since client's saveSet is no longer defined as a pointer*
Added externs back in
Change #if to #ifdef to fix compiler warning
Add function declarations that were inadvertently removed by previous check
in
Disable extensions that are not (yet) supported by DMX
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/dixutils.c | 16 | ||||
| -rw-r--r-- | dix/window.c | 6 |
2 files changed, 3 insertions, 19 deletions
diff --git a/dix/dixutils.c b/dix/dixutils.c index f78497b65..4f3de047d 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -354,11 +354,7 @@ AlterSaveSetForClient(ClientPtr client, Bool remap) { int numnow; -#ifdef XFIXES SaveSetElt *pTmp = NULL; -#else - pointer *pTmp = NULL; -#endif int j; numnow = client->numSaved; @@ -374,11 +370,7 @@ AlterSaveSetForClient(ClientPtr client, if (j < numnow) /* duplicate */ return(Success); numnow++; -#ifdef XFIXES - pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow); -#else - pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow); -#endif + pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow); if (!pTmp) return(BadAlloc); client->saveSet = pTmp; @@ -398,11 +390,7 @@ AlterSaveSetForClient(ClientPtr client, numnow--; if (numnow) { -#ifdef XFIXES - pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(SaveSetElt) * numnow); -#else - pTmp = (pointer *)xrealloc(client->saveSet, sizeof(pointer) * numnow); -#endif + pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow); if (pTmp) client->saveSet = pTmp; } diff --git a/dix/window.c b/dix/window.c index 005f5fd69..f737e0f01 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.3 2004/07/29 18:43:58 stukreit Exp $ */ /* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ /* @@ -3179,11 +3179,7 @@ HandleSaveSet(client) } xfree(client->saveSet); client->numSaved = 0; -#ifdef XFIXES client->saveSet = (SaveSetElt *)NULL; -#else - client->saveSet = (pointer *)NULL; -#endif } Bool |