patch-src_compat-api_h 1.2 KB

123456789101112131415161718192021222324252627282930
  1. --- xf86-video-geode-2.11.18.orig/src/compat-api.h 2016-02-03 19:46:59.000000000 +0100
  2. +++ xf86-video-geode-2.11.18/src/compat-api.h 2016-11-28 08:39:15.624653928 +0100
  3. @@ -53,8 +53,13 @@
  4. #define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScrn, 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 pScrn
  13. #define CLOSE_SCREEN_ARGS scrnIndex, pScrn
  14. @@ -89,8 +94,13 @@
  15. #define SCREEN_INIT_ARGS_DECL ScreenPtr pScrn, 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 pScrn
  24. #define CLOSE_SCREEN_ARGS pScrn