Commit 015d728b authored by Peter Hutterer's avatar Peter Hutterer

Merge branch 'master' into mpx

Conflicts:

	dix/devices.c
	dix/events.c
	mi/misprite.c
parents 65b0eb60 b167583f
...@@ -496,11 +496,11 @@ int __glXDispSwap_CopySubBufferMESA(__GLXclientState *cl, GLbyte *pc) ...@@ -496,11 +496,11 @@ int __glXDispSwap_CopySubBufferMESA(__GLXclientState *cl, GLbyte *pc)
GLXDrawable *drawId; GLXDrawable *drawId;
int *buffer; int *buffer;
__GLX_DECLARE_SWAP_VARIABLES;
(void) drawId; (void) drawId;
(void) buffer; (void) buffer;
__GLX_DECLARE_SWAP_VARIABLES;
pc += __GLX_VENDPRIV_HDR_SIZE; pc += __GLX_VENDPRIV_HDR_SIZE;
__GLX_SWAP_SHORT(&req->length); __GLX_SWAP_SHORT(&req->length);
......
...@@ -495,6 +495,7 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, ...@@ -495,6 +495,7 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
context->base.loseCurrent = __glXDRIcontextLoseCurrent; context->base.loseCurrent = __glXDRIcontextLoseCurrent;
context->base.copy = __glXDRIcontextCopy; context->base.copy = __glXDRIcontextCopy;
context->base.forceCurrent = __glXDRIcontextForceCurrent; context->base.forceCurrent = __glXDRIcontextForceCurrent;
context->base.pScreen = screen->base.pScreen;
context->base.textureFromPixmap = &__glXDRItextureFromPixmap; context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
......
...@@ -119,9 +119,7 @@ static int pixmapFormat; ...@@ -119,9 +119,7 @@ static int pixmapFormat;
static int shmPixFormat[MAXSCREENS]; static int shmPixFormat[MAXSCREENS];
static ShmFuncsPtr shmFuncs[MAXSCREENS]; static ShmFuncsPtr shmFuncs[MAXSCREENS];
static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS]; static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
#ifdef PIXPRIV
static int shmPixmapPrivate; static int shmPixmapPrivate;
#endif
static ShmFuncs miFuncs = {NULL, miShmPutImage}; static ShmFuncs miFuncs = {NULL, miShmPutImage};
static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage}; static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
...@@ -237,7 +235,6 @@ ShmExtensionInit(INITARGS) ...@@ -237,7 +235,6 @@ ShmExtensionInit(INITARGS)
destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap; destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap;
screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap; screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
} }
#ifdef PIXPRIV
shmPixmapPrivate = AllocatePixmapPrivateIndex(); shmPixmapPrivate = AllocatePixmapPrivateIndex();
for (i = 0; i < screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++)
{ {
...@@ -245,7 +242,6 @@ ShmExtensionInit(INITARGS) ...@@ -245,7 +242,6 @@ ShmExtensionInit(INITARGS)
shmPixmapPrivate, 0)) shmPixmapPrivate, 0))
return; return;
} }
#endif
} }
} }
ShmSegType = CreateNewResourceType(ShmDetachSegment); ShmSegType = CreateNewResourceType(ShmDetachSegment);
...@@ -299,22 +295,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap) ...@@ -299,22 +295,7 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
if (pPixmap->refcnt == 1) if (pPixmap->refcnt == 1)
{ {
ShmDescPtr shmdesc; ShmDescPtr shmdesc;
#ifdef PIXPRIV
shmdesc = (ShmDescPtr) pPixmap->devPrivates[shmPixmapPrivate].ptr; shmdesc = (ShmDescPtr) pPixmap->devPrivates[shmPixmapPrivate].ptr;
#else
char *base = (char *) pPixmap->devPrivate.ptr;
if (base != (pointer) (pPixmap + 1))
{
for (shmdesc = Shmsegs; shmdesc; shmdesc = shmdesc->next)
{
if (shmdesc->addr <= base && base <= shmdesc->addr + shmdesc->size)
break;
}
}
else
shmdesc = 0;
#endif
if (shmdesc) if (shmdesc)
ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id); ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id);
} }
...@@ -781,9 +762,7 @@ CreatePmap: ...@@ -781,9 +762,7 @@ CreatePmap:
shmdesc->addr + stuff->offset); shmdesc->addr + stuff->offset);
if (pMap) { if (pMap) {
#ifdef PIXPRIV
pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc; pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
#endif
shmdesc->refcnt++; shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = newPix->info[j].id; pMap->drawable.id = newPix->info[j].id;
...@@ -1097,9 +1076,7 @@ CreatePmap: ...@@ -1097,9 +1076,7 @@ CreatePmap:
shmdesc->addr + stuff->offset); shmdesc->addr + stuff->offset);
if (pMap) if (pMap)
{ {
#ifdef PIXPRIV
pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc; pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
#endif
shmdesc->refcnt++; shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = stuff->pid; pMap->drawable.id = stuff->pid;
......
...@@ -102,12 +102,8 @@ afbCreatePixmap(pScreen, width, height, depth) ...@@ -102,12 +102,8 @@ afbCreatePixmap(pScreen, width, height, depth)
pPixmap->drawable.height = height; pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth; pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
#ifdef PIXPRIV
pPixmap->devPrivate.ptr = datasize ? pPixmap->devPrivate.ptr = datasize ?
(pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL; (pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL;
#else
pPixmap->devPrivate.ptr = (pointer)(pPixmap + 1);
#endif
return(pPixmap); return(pPixmap);
} }
......
...@@ -96,12 +96,8 @@ cfbCreatePixmap (pScreen, width, height, depth) ...@@ -96,12 +96,8 @@ cfbCreatePixmap (pScreen, width, height, depth)
pPixmap->drawable.height = height; pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth; pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1; pPixmap->refcnt = 1;
#ifdef PIXPRIV
pPixmap->devPrivate.ptr = datasize ? pPixmap->devPrivate.ptr = datasize ?
(pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL; (pointer)((char *)pPixmap + pScreen->totalPixmapSize) : NULL;
#else
pPixmap->devPrivate.ptr = (pointer)(pPixmap + 1);
#endif
return pPixmap; return pPixmap;
} }
......
...@@ -1297,6 +1297,8 @@ return 0;} ...@@ -1297,6 +1297,8 @@ return 0;}
# LDFLAGS=$save_LDFLAGS # LDFLAGS=$save_LDFLAGS
# ]) # ])
xorg_cv_AGL_framework=no xorg_cv_AGL_framework=no
DARWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
AC_SUBST([DARWIN_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:]) AC_CHECK_LIB([Xplugin],[xp_init],[:])
AC_SUBST([APPLE_APPLICATIONS_DIR]) AC_SUBST([APPLE_APPLICATIONS_DIR])
CFLAGS="${CFLAGS} -D__DARWIN__" CFLAGS="${CFLAGS} -D__DARWIN__"
......
...@@ -77,10 +77,10 @@ void FreeAtom(NodePtr patom); ...@@ -77,10 +77,10 @@ void FreeAtom(NodePtr patom);
_X_EXPORT Atom _X_EXPORT Atom
MakeAtom(char *string, unsigned len, Bool makeit) MakeAtom(char *string, unsigned len, Bool makeit)
{ {
register NodePtr * np; NodePtr * np;
unsigned i; unsigned i;
int comp; int comp;
register unsigned int fp = 0; unsigned int fp = 0;
np = &atomRoot; np = &atomRoot;
for (i = 0; i < (len+1)/2; i++) for (i = 0; i < (len+1)/2; i++)
...@@ -107,7 +107,7 @@ MakeAtom(char *string, unsigned len, Bool makeit) ...@@ -107,7 +107,7 @@ MakeAtom(char *string, unsigned len, Bool makeit)
} }
if (makeit) if (makeit)
{ {
register NodePtr nd; NodePtr nd;
nd = (NodePtr) xalloc(sizeof(NodeRec)); nd = (NodePtr) xalloc(sizeof(NodeRec));
if (!nd) if (!nd)
......
...@@ -95,8 +95,8 @@ static int BlueComp( ...@@ -95,8 +95,8 @@ static int BlueComp(
); );
static void FreePixels( static void FreePixels(
register ColormapPtr /*pmap*/, ColormapPtr /*pmap*/,
register int /*client*/ int /*client*/
); );
static void CopyFree( static void CopyFree(
...@@ -259,9 +259,9 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, ...@@ -259,9 +259,9 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
int class, size; int class, size;
unsigned long sizebytes; unsigned long sizebytes;
ColormapPtr pmap; ColormapPtr pmap;
register EntryPtr pent; EntryPtr pent;
int i; int i;
register Pixel *ppix, **pptr; Pixel *ppix, **pptr;
class = pVisual->class; class = pVisual->class;
if(!(class & DynamicClass) && (alloc != AllocNone) && (client != SERVER_ID)) if(!(class & DynamicClass) && (alloc != AllocNone) && (client != SERVER_ID))
...@@ -428,8 +428,8 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, ...@@ -428,8 +428,8 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
int int
FreeColormap (pointer value, XID mid) FreeColormap (pointer value, XID mid)
{ {
int i; int i;
register EntryPtr pent; EntryPtr pent;
ColormapPtr pmap = (ColormapPtr)value; ColormapPtr pmap = (ColormapPtr)value;
if(CLIENT_ID(mid) != SERVER_ID) if(CLIENT_ID(mid) != SERVER_ID)
...@@ -744,9 +744,9 @@ static void ...@@ -744,9 +744,9 @@ static void
UpdateColors (ColormapPtr pmap) UpdateColors (ColormapPtr pmap)
{ {
xColorItem *defs; xColorItem *defs;
register xColorItem *pdef; xColorItem *pdef;
register EntryPtr pent; EntryPtr pent;
register VisualPtr pVisual; VisualPtr pVisual;
int i, n, size; int i, n, size;
pVisual = pmap->pVisual; pVisual = pmap->pVisual;
...@@ -993,14 +993,14 @@ AllocColor (ColormapPtr pmap, ...@@ -993,14 +993,14 @@ AllocColor (ColormapPtr pmap,
*/ */
_X_EXPORT void _X_EXPORT void
FakeAllocColor (register ColormapPtr pmap, register xColorItem *item) FakeAllocColor (ColormapPtr pmap, xColorItem *item)
{ {
Pixel pixR, pixG, pixB; Pixel pixR, pixG, pixB;
Pixel temp; Pixel temp;
int entries; int entries;
xrgb rgb; xrgb rgb;
int class; int class;
register VisualPtr pVisual; VisualPtr pVisual;
pVisual = pmap->pVisual; pVisual = pmap->pVisual;
rgb.red = item->red; rgb.red = item->red;
...@@ -1059,9 +1059,9 @@ FakeAllocColor (register ColormapPtr pmap, register xColorItem *item) ...@@ -1059,9 +1059,9 @@ FakeAllocColor (register ColormapPtr pmap, register xColorItem *item)
/* free a pixel value obtained from FakeAllocColor */ /* free a pixel value obtained from FakeAllocColor */
_X_EXPORT void _X_EXPORT void
FakeFreeColor(register ColormapPtr pmap, Pixel pixel) FakeFreeColor(ColormapPtr pmap, Pixel pixel)
{ {
register VisualPtr pVisual; VisualPtr pVisual;
Pixel pixR, pixG, pixB; Pixel pixR, pixG, pixB;
switch (pmap->class) { switch (pmap->class) {
...@@ -1507,11 +1507,11 @@ QueryColors (ColormapPtr pmap, int count, Pixel *ppixIn, xrgb *prgbList) ...@@ -1507,11 +1507,11 @@ QueryColors (ColormapPtr pmap, int count, Pixel *ppixIn, xrgb *prgbList)
} }
static void static void
FreePixels(register ColormapPtr pmap, register int client) FreePixels(ColormapPtr pmap, int client)
{ {
register Pixel *ppix, *ppixStart; Pixel *ppix, *ppixStart;
register int n; int n;
int class; int class;
class = pmap->class; class = pmap->class;
ppixStart = pmap->clientPixelsRed[client]; ppixStart = pmap->clientPixelsRed[client];
...@@ -1646,8 +1646,8 @@ AllocColorPlanes (int client, ColormapPtr pmap, int colors, ...@@ -1646,8 +1646,8 @@ AllocColorPlanes (int client, ColormapPtr pmap, int colors,
{ {
int ok; int ok;
Pixel mask, *ppixFirst; Pixel mask, *ppixFirst;
register Pixel shift; Pixel shift;
register int i; int i;
int class; int class;
int oldcount; int oldcount;
colorResource *pcr = (colorResource *)NULL; colorResource *pcr = (colorResource *)NULL;
...@@ -2409,10 +2409,10 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe ...@@ -2409,10 +2409,10 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe
_X_EXPORT int _X_EXPORT int
StoreColors (ColormapPtr pmap, int count, xColorItem *defs) StoreColors (ColormapPtr pmap, int count, xColorItem *defs)
{ {
register Pixel pix; Pixel pix;
register xColorItem *pdef; xColorItem *pdef;
register EntryPtr pent, pentT, pentLast; EntryPtr pent, pentT, pentLast;
register VisualPtr pVisual; VisualPtr pVisual;
SHAREDCOLOR *pred, *pgreen, *pblue; SHAREDCOLOR *pred, *pgreen, *pblue;
int n, ChgRed, ChgGreen, ChgBlue, idef; int n, ChgRed, ChgGreen, ChgBlue, idef;
int class, errVal = Success; int class, errVal = Success;
......
...@@ -87,7 +87,7 @@ FreeCursorBits(CursorBitsPtr bits) ...@@ -87,7 +87,7 @@ FreeCursorBits(CursorBitsPtr bits)
#endif #endif
if (bits->refcnt == 0) if (bits->refcnt == 0)
{ {
register GlyphSharePtr *prev, this; GlyphSharePtr *prev, this;
for (prev = &sharedGlyphs; for (prev = &sharedGlyphs;
(this = *prev) && (this->bits != bits); (this = *prev) && (this->bits != bits);
...@@ -142,7 +142,7 @@ FreeCursor(pointer value, XID cid) ...@@ -142,7 +142,7 @@ FreeCursor(pointer value, XID cid)
static void static void
CheckForEmptyMask(CursorBitsPtr bits) CheckForEmptyMask(CursorBitsPtr bits)
{ {
register unsigned char *msk = bits->mask; unsigned char *msk = bits->mask;
int n = BitmapBytePad(bits->width) * bits->height; int n = BitmapBytePad(bits->width) * bits->height;
bits->emptyMask = FALSE; bits->emptyMask = FALSE;
...@@ -341,8 +341,8 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, ...@@ -341,8 +341,8 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
} }
if (!maskfont) if (!maskfont)
{ {
register long n; long n;
register unsigned char *mskptr; unsigned char *mskptr;
n = BitmapBytePad(cm.width)*(long)cm.height; n = BitmapBytePad(cm.width)*(long)cm.height;
mskptr = mskbits = (unsigned char *)xalloc(n); mskptr = mskbits = (unsigned char *)xalloc(n);
......
...@@ -87,7 +87,7 @@ static ClientPtr pairingClient = NULL; ...@@ -87,7 +87,7 @@ static ClientPtr pairingClient = NULL;
DeviceIntPtr DeviceIntPtr
AddInputDevice(DeviceProc deviceProc, Bool autoStart) AddInputDevice(DeviceProc deviceProc, Bool autoStart)
{ {
register DeviceIntPtr dev, *prev; /* not a typo */ DeviceIntPtr dev, *prev; /* not a typo */
if (inputInfo.numDevices >= MAX_DEVICES) if (inputInfo.numDevices >= MAX_DEVICES)
return (DeviceIntPtr)NULL; return (DeviceIntPtr)NULL;
...@@ -156,9 +156,9 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart) ...@@ -156,9 +156,9 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
} }
Bool Bool
EnableDevice(register DeviceIntPtr dev) EnableDevice(DeviceIntPtr dev)
{ {
register DeviceIntPtr *prev; DeviceIntPtr *prev;
int ret; int ret;
for (prev = &inputInfo.off_devices; for (prev = &inputInfo.off_devices;
...@@ -182,9 +182,9 @@ EnableDevice(register DeviceIntPtr dev) ...@@ -182,9 +182,9 @@ EnableDevice(register DeviceIntPtr dev)
} }
Bool Bool
DisableDevice(register DeviceIntPtr dev) DisableDevice(DeviceIntPtr dev)
{ {
register DeviceIntPtr *prev; DeviceIntPtr *prev;
for (prev = &inputInfo.devices; for (prev = &inputInfo.devices;
*prev && (*prev != dev); *prev && (*prev != dev);
...@@ -336,7 +336,7 @@ CorePointerProc(DeviceIntPtr pDev, int what) ...@@ -336,7 +336,7 @@ CorePointerProc(DeviceIntPtr pDev, int what)
void void
InitCoreDevices() InitCoreDevices()
{ {
register DeviceIntPtr dev; DeviceIntPtr dev;
if (CoreDevicePrivatesGeneration != serverGeneration) { if (CoreDevicePrivatesGeneration != serverGeneration) {
CoreDevicePrivatesIndex = AllocateDevicePrivateIndex(); CoreDevicePrivatesIndex = AllocateDevicePrivateIndex();
...@@ -453,7 +453,7 @@ InitAndStartDevices() ...@@ -453,7 +453,7 @@ InitAndStartDevices()
} }
static void static void
CloseDevice(register DeviceIntPtr dev) CloseDevice(DeviceIntPtr dev)
{ {
KbdFeedbackPtr k, knext; KbdFeedbackPtr k, knext;
PtrFeedbackPtr p, pnext; PtrFeedbackPtr p, pnext;
...@@ -552,6 +552,9 @@ CloseDevice(register DeviceIntPtr dev) ...@@ -552,6 +552,9 @@ CloseDevice(register DeviceIntPtr dev)
PickPointer(clients[j]); PickPointer(clients[j]);
} }
if (dev->devPrivates)
xfree(dev->devPrivates);
xfree(dev->coreGrab.sync.event); xfree(dev->coreGrab.sync.event);
xfree(dev->deviceGrab.sync.event); xfree(dev->deviceGrab.sync.event);
xfree(dev); xfree(dev);
...@@ -560,7 +563,7 @@ CloseDevice(register DeviceIntPtr dev) ...@@ -560,7 +563,7 @@ CloseDevice(register DeviceIntPtr dev)
void void
CloseDownDevices() CloseDownDevices()
{ {
register DeviceIntPtr dev, next; DeviceIntPtr dev, next;
for (dev = inputInfo.devices; dev; dev = next) for (dev = inputInfo.devices; dev; dev = next)
{ {
...@@ -692,7 +695,7 @@ QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode) ...@@ -692,7 +695,7 @@ QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
} }
Bool Bool
SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src) SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
{ {
int i, j; int i, j;
int rowDif = src->minKeyCode - dst->minKeyCode; int rowDif = src->minKeyCode - dst->minKeyCode;
...@@ -741,7 +744,7 @@ SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src) ...@@ -741,7 +744,7 @@ SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src)
} }
static Bool static Bool
InitModMap(register KeyClassPtr keyc) InitModMap(KeyClassPtr keyc)
{ {
int i, j; int i, j;
CARD8 keysPerModifier[8]; CARD8 keysPerModifier[8];
...@@ -786,7 +789,7 @@ _X_EXPORT Bool ...@@ -786,7 +789,7 @@ _X_EXPORT Bool
InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[]) InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[])
{ {
int i; int i;
register KeyClassPtr keyc; KeyClassPtr keyc;
keyc = (KeyClassPtr)xalloc(sizeof(KeyClassRec)); keyc = (KeyClassPtr)xalloc(sizeof(KeyClassRec));
if (!keyc) if (!keyc)
...@@ -821,10 +824,10 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers ...@@ -821,10 +824,10 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers
} }
_X_EXPORT Bool _X_EXPORT Bool
InitButtonClassDeviceStruct(register DeviceIntPtr dev, int numButtons, InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons,
CARD8 *map) CARD8 *map)
{ {
register ButtonClassPtr butc; ButtonClassPtr butc;
int i; int i;
butc = (ButtonClassPtr)xalloc(sizeof(ButtonClassRec)); butc = (ButtonClassPtr)xalloc(sizeof(ButtonClassRec));
...@@ -850,7 +853,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, ...@@ -850,7 +853,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
int numMotionEvents, int mode) int numMotionEvents, int mode)
{ {
int i; int i;
register ValuatorClassPtr valc; ValuatorClassPtr valc;
if (!dev) if (!dev)
return FALSE; return FALSE;
...@@ -892,7 +895,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, ...@@ -892,7 +895,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
_X_EXPORT Bool _X_EXPORT Bool
InitAbsoluteClassDeviceStruct(DeviceIntPtr dev) InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
{ {
register AbsoluteClassPtr abs; AbsoluteClassPtr abs;
abs = (AbsoluteClassPtr)xalloc(sizeof(AbsoluteClassRec)); abs = (AbsoluteClassPtr)xalloc(sizeof(AbsoluteClassRec));
if (!abs) if (!abs)
...@@ -922,7 +925,7 @@ InitAbsoluteClassDeviceStruct(DeviceIntPtr dev) ...@@ -922,7 +925,7 @@ InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
_X_EXPORT Bool _X_EXPORT Bool
InitFocusClassDeviceStruct(DeviceIntPtr dev) InitFocusClassDeviceStruct(DeviceIntPtr dev)