summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-09-01 18:51:14 -0700
committerAdam Jackson <ajax@redhat.com>2016-07-18 15:27:51 -0400
commit9d15912aa475b733bbb20efc367a67dacad63bf1 (patch)
treebdbad787bf5be280df99636b37350158da233a8e /include
parentfb0802113b4c57819cba15d64baf79bf4148607e (diff)
Remove fd_set from Block/Wakeup handler API
This removes the last uses of fd_set from the server interfaces outside of the OS layer itself. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/dix.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/dix.h b/include/dix.h
index f63606afa..ae9719ae9 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -208,28 +208,28 @@ extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ ,
extern _X_EXPORT void DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ );
-extern _X_EXPORT void BlockHandler(void *pTimeout,
- void *pReadmask);
+extern _X_EXPORT void BlockHandler(void *timeout);
-extern _X_EXPORT void WakeupHandler(int result,
- void *pReadmask);
+extern _X_EXPORT void WakeupHandler(int result);
void
- EnableLimitedSchedulingLatency(void);
+EnableLimitedSchedulingLatency(void);
void
- DisableLimitedSchedulingLatency(void);
+DisableLimitedSchedulingLatency(void);
-typedef void (*WakeupHandlerProcPtr) (void *blockData,
- int result,
- void *pReadmask);
+typedef void (*ServerBlockHandlerProcPtr) (void *blockData,
+ void *timeout);
-extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
- WakeupHandlerProcPtr wakeupHandler,
+typedef void (*ServerWakeupHandlerProcPtr) (void *blockData,
+ int result);
+
+extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(ServerBlockHandlerProcPtr blockHandler,
+ ServerWakeupHandlerProcPtr wakeupHandler,
void *blockData);
-extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
- WakeupHandlerProcPtr wakeupHandler,
+extern _X_EXPORT void RemoveBlockAndWakeupHandlers(ServerBlockHandlerProcPtr blockHandler,
+ ServerWakeupHandlerProcPtr wakeupHandler,
void *blockData);
extern _X_EXPORT void InitBlockAndWakeupHandlers(void);