dmx: warning fixes
dmxinputinit.c: In function ‘dmxBlockHandler’: dmxinputinit.c:610:44: warning: cast from pointer to integer of different size dmxinputinit.c: In function ‘dmxWakeupHandler’: dmxinputinit.c:637:41: warning: cast from pointer to integer of different size dmxinputinit.c: In function ‘dmxInputInit’: dmxinputinit.c:1041:36: warning: cast to pointer from integer of different size Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
ffd323b7c0
commit
7a08f9abef
@ -607,7 +607,7 @@ static void dmxCollectAll(DMXInputInfo *dmxInput)
|
|||||||
static void dmxBlockHandler(pointer blockData, OSTimePtr pTimeout,
|
static void dmxBlockHandler(pointer blockData, OSTimePtr pTimeout,
|
||||||
pointer pReadMask)
|
pointer pReadMask)
|
||||||
{
|
{
|
||||||
DMXInputInfo *dmxInput = &dmxInputs[(int)blockData];
|
DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t)blockData];
|
||||||
static unsigned long generation = 0;
|
static unsigned long generation = 0;
|
||||||
|
|
||||||
if (generation != serverGeneration) {
|
if (generation != serverGeneration) {
|
||||||
@ -634,7 +634,7 @@ static void dmxSwitchReturn(pointer p)
|
|||||||
|
|
||||||
static void dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
|
static void dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
|
||||||
{
|
{
|
||||||
DMXInputInfo *dmxInput = &dmxInputs[(int)blockData];
|
DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t)blockData];
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (dmxInput->vt_switch_pending) {
|
if (dmxInput->vt_switch_pending) {
|
||||||
@ -1036,9 +1036,8 @@ void dmxInputInit(DMXInputInfo *dmxInput)
|
|||||||
dmxInput->processInputEvents = dmxProcessInputEvents;
|
dmxInput->processInputEvents = dmxProcessInputEvents;
|
||||||
dmxInput->detached = False;
|
dmxInput->detached = False;
|
||||||
|
|
||||||
RegisterBlockAndWakeupHandlers(dmxBlockHandler,
|
RegisterBlockAndWakeupHandlers(dmxBlockHandler, dmxWakeupHandler,
|
||||||
dmxWakeupHandler,
|
(void *)(uintptr_t)dmxInput->inputIdx);
|
||||||
(void *)dmxInput->inputIdx);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dmxInputFreeLocal(DMXLocalInputInfoRec *local)
|
static void dmxInputFreeLocal(DMXLocalInputInfoRec *local)
|
||||||
|
Loading…
Reference in New Issue
Block a user