From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/include/dix.h | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'xorg-server/include/dix.h') diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index fa7ccd4a3..8371df072 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -147,14 +147,14 @@ extern _X_EXPORT void UpdateCurrentTime(void); extern _X_EXPORT void UpdateCurrentTimeIf(void); -extern _X_EXPORT int dixDestroyPixmap(pointer /*value */ , +extern _X_EXPORT int dixDestroyPixmap(void */*value */ , XID /*pid */ ); extern _X_EXPORT void InitClient(ClientPtr /*client */ , int /*i */ , - pointer /*ospriv */ ); + void */*ospriv */ ); -extern _X_EXPORT ClientPtr NextAvailableClient(pointer /*ospriv */ ); +extern _X_EXPORT ClientPtr NextAvailableClient(void */*ospriv */ ); extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ , unsigned int /*majorCode */ , @@ -203,11 +203,11 @@ extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ , extern _X_EXPORT void DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ ); -extern _X_EXPORT void BlockHandler(pointer /*pTimeout */ , - pointer /*pReadmask */ ); +extern _X_EXPORT void BlockHandler(void */*pTimeout */ , + void */*pReadmask */ ); extern _X_EXPORT void WakeupHandler(int /*result */ , - pointer /*pReadmask */ ); + void */*pReadmask */ ); void EnableLimitedSchedulingLatency(void); @@ -215,21 +215,21 @@ void void DisableLimitedSchedulingLatency(void); -typedef void (*WakeupHandlerProcPtr) (pointer /* blockData */ , +typedef void (*WakeupHandlerProcPtr) (void */* blockData */ , int /* result */ , - pointer /* pReadmask */ ); + void */* pReadmask */ ); extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr /*blockHandler */ , WakeupHandlerProcPtr /*wakeupHandler */ , - pointer /*blockData */ ); + void */*blockData */ ); extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr /*blockHandler */ , WakeupHandlerProcPtr /*wakeupHandler */ , - pointer /*blockData */ ); + void */*blockData */ ); extern _X_EXPORT void InitBlockAndWakeupHandlers(void); @@ -241,18 +241,18 @@ extern _X_EXPORT Bool QueueWorkProc(Bool (* /*function */ )( ClientPtr /*clientUnused */ , - pointer + void * /*closure */ ), ClientPtr /*client */ , - pointer /*closure */ + void */*closure */ ); typedef Bool (*ClientSleepProcPtr) (ClientPtr /*client */ , - pointer /*closure */ ); + void */*closure */ ); extern _X_EXPORT Bool ClientSleep(ClientPtr /*client */ , ClientSleepProcPtr /* function */ , - pointer /*closure */ ); + void */*closure */ ); #ifndef ___CLIENTSIGNAL_DEFINED___ #define ___CLIENTSIGNAL_DEFINED___ @@ -289,7 +289,10 @@ extern _X_EXPORT void SetVendorRelease(int release); extern _X_EXPORT void -SetVendorString(char *string); +SetVendorString(const char *string); + +int +dix_main(int argc, char *argv[], char *envp[]); /* events.c */ @@ -441,7 +444,7 @@ extern void RecalculateDeliverableEvents(WindowPtr /* pWin */ ); extern _X_EXPORT int -OtherClientGone(pointer /* value */ , +OtherClientGone(void */* value */ , XID /* id */ ); extern void -- cgit v1.2.3