mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-27 21:22:26 +00:00
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
This commit is contained in:
parent
274d5044ac
commit
813d75f9d3
7 changed files with 27 additions and 37 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue