summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compat-api.h50
1 files changed, 0 insertions, 50 deletions
diff --git a/src/compat-api.h b/src/compat-api.h
index f6df925..bbeb769 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -31,54 +31,6 @@
#ifndef COMPAT_API_H
#define COMPAT_API_H
-#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-#endif
-
-#ifndef XF86_HAS_SCRN_CONV
-#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-#endif
-
-#ifndef XF86_SCRN_INTERFACE
-
-#define DDC_CALL(pScrni) (pScrni->scrnIndex)
-
-#define SCRN_ARG_TYPE int
-#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrni = xf86Screens[(arg1)]
-
-#define SCREEN_ARG_TYPE int
-#define SCREEN_PTR(arg1) ScreenPtr pScrn = screenInfo.screens[(arg1)]
-
-#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScrn, int argc, char **argv
-
-#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-
-#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScrn
-#define CLOSE_SCREEN_ARGS scrnIndex, pScrn
-
-#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-#define ADJUST_FRAME_ARGS(x, y) pScrni->scrnIndex, (x), (y), 0
-
-#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr pMode, int flags
-
-#define FREE_SCREEN_ARGS_DECL int arg, int flags
-#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
-
-#define VT_FUNC_ARGS_DECL int arg, int flags
-#define VT_FUNC_ARGS(flags) pScrni->scrnIndex, (flags)
-
-#define XF86_ENABLEDISABLEFB_ARG(pScrni, x) ((pScrni)->scrnIndex), (x)
-
-#define POINTER_MOVED_ARGS_DECL int arg, int x, int y
-#define POINTER_MOVED_ARGS(x, y) pScrni->scrnIndex, (x), (y)
-
-#define VALID_MODE_ARGS_DECL int arg, DisplayModePtr pMode, Bool Verbose, int flags
-
-#else /*XF86_SCRN_INTERFACE) */
-
#define DDC_CALL(pScrni) (pScrni)
#define SCRN_ARG_TYPE ScrnInfoPtr
@@ -119,5 +71,3 @@
#define VALID_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr pMode, Bool Verbose, int flags
#endif
-
-#endif