diff options
| author | Adam Jackson <ajax@redhat.com> | 2016-07-19 10:01:31 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-19 10:01:31 -0400 |
| commit | 493ff095e1c7325162e4ccda5f60d859b53ab6d3 (patch) | |
| tree | 4c2ad7b2ec1babddd9607962dfffa5e83e763b7b | |
| parent | 0152dd78f6568befec61e1738f5d2a6f893b57e7 (diff) | |
Revert "Adapt Block/WakeupHandler signature for ABI 23"
This reverts commit 0152dd78f6568befec61e1738f5d2a6f893b57e7.
Had put this in the wrong half of the ifndef
| -rw-r--r-- | src/compat-api.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/compat-api.h b/src/compat-api.h index 7f96c50..98ba435 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -48,19 +48,11 @@ #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 |