patch-src_compat-api_h 1.2 KB

123456789101112131415161718192021222324252627282930
  1. --- xf86-video-siliconmotion-1.7.8.orig/src/compat-api.h 2015-05-08 13:08:17.000000000 +0200
  2. +++ xf86-video-siliconmotion-1.7.8/src/compat-api.h 2017-01-26 02:35:36.147052952 +0100
  3. @@ -48,8 +48,13 @@
  4. #define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
  5. +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
  6. +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
  7. +#define BLOCKHANDLER_ARGS arg, pTimeout
  8. +#else
  9. #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
  10. #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
  11. +#endif
  12. #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
  13. #define CLOSE_SCREEN_ARGS scrnIndex, pScreen
  14. @@ -75,8 +80,13 @@
  15. #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
  16. +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
  17. +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
  18. +#define BLOCKHANDLER_ARGS arg, pTimeout
  19. +#else
  20. #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
  21. #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
  22. +#endif
  23. #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
  24. #define CLOSE_SCREEN_ARGS pScreen