diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-07-19 09:53:16 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-19 09:53:16 -0400 |
| commit | 0152dd78f6568befec61e1738f5d2a6f893b57e7 (patch) | |
| tree | da886875744f88c8c9b4b4d8eec4fa29ceabe177 | |
| parent | e36331f3f2641900efe8363fe3dc15877a72c027 (diff) | |
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/compat-api.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/compat-api.h b/src/compat-api.h index 98ba435..7f96c50 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -48,11 +48,19 @@ #define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout + +#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result +#define WAKEUPHANDLER_ARGS arg, wakeupData, result +#else #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask #define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask #define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask +#endif #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen #define CLOSE_SCREEN_ARGS scrnIndex, pScreen |