SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge XFree86 4.3.0.1 to -CURRENT

Browse Source
This commit is contained in:
Kaleb Keithley
2003-11-17 19:03:47 +00:00
parent 9508a382f8
commit c57959ad6a
615 changed files with 42990 additions and 101132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
record/set.c
View File

@@ -27,6 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/record/set.c,v 1.7 2001/12/14 20:00:37 dawes Exp $ */
/*
@@ -88,6 +89,11 @@ void *Xcalloc(size)
#include "set.h"
#ifdef XFree86LOADER
#include "xf86_libc.h"
#include "xf86_ansic.h"
#endif
static int
maxMemberInInterval(pIntervals, nIntervals)
RecordSetInterval *pIntervals;
@@ -197,7 +203,7 @@ BitVectorIterateSet(pSet, pIter, pInterval)
RecordSetIteratePtr pIter;
RecordSetInterval *pInterval;
{
int iterbit = (int)pIter;
int iterbit = (int)(long)pIter;
int b;
b = BitVectorFindBit(pSet, iterbit, TRUE);
@@ -206,7 +212,7 @@ BitVectorIterateSet(pSet, pIter, pInterval)
b = BitVectorFindBit(pSet, b, FALSE);
pInterval->last = (b < 0) ? ((BitVectorSetPtr)pSet)->maxMember : b - 1;
return (RecordSetIteratePtr)(pInterval->last + 1);
return (RecordSetIteratePtr)(long)(pInterval->last + 1);
}
RecordSetOperations BitVectorSetOperations = {
@@ -515,7 +521,7 @@ RecordCreateSet(pIntervals, nIntervals, pMem, memsize)
&pCreateSet);
if (pMem)
{
if ( ((int)pMem & (alignment-1) ) || memsize < size)
if ( ((long)pMem & (alignment-1) ) || memsize < size)
return NULL;
}
return (*pCreateSet)(pIntervals, nIntervals, pMem, size);