diff options
Diffstat (limited to 'src/apm_video.c')
| -rw-r--r-- | src/apm_video.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/apm_video.c b/src/apm_video.c index 9a9bc39..d8b69fb 100644 --- a/src/apm_video.c +++ b/src/apm_video.c @@ -19,7 +19,6 @@ static XF86VideoAdaptorPtr A(SetupImageVideo)(ScreenPtr); static void A(StopVideo)(ScrnInfoPtr, pointer, Bool); static int A(SetPortAttribute)(ScrnInfoPtr, Atom, INT32, pointer); -#ifndef IOP_ACCESS static int ApmGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer); static void ApmQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, @@ -27,7 +26,6 @@ static void ApmQueryBestSize(ScrnInfoPtr, Bool, short, short, short, static int ApmQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *); -#endif static int A(ReputImage)(ScrnInfoPtr, short, short, RegionPtr, pointer, DrawablePtr); static int A(PutImage)(ScrnInfoPtr, short, short, short, short, short, @@ -358,7 +356,6 @@ A(SetupImageVideo)(ScreenPtr pScreen) return adapt; } -#ifndef IOP_ACCESS /* ApmClipVideo - Takes the dst box in standard X BoxRec form (top and left @@ -420,7 +417,6 @@ ApmClipVideo(BoxPtr dst, INT32 *x1, INT32 *x2, INT32 *y1, INT32 *y2, else *scaley = ((*y2 - *y1) / (dst->y2 - dst->y1)) >> 4; } -#endif static void A(StopVideo)(ScrnInfoPtr pScrn, pointer data, Bool shutdown) @@ -457,7 +453,6 @@ A(SetPortAttribute)(ScrnInfoPtr pScrn, Atom attribute, INT32 value, return Success; } -#ifndef IOP_ACCESS static int ApmGetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 *value, pointer data) @@ -485,7 +480,6 @@ ApmQueryBestSize(ScrnInfoPtr pScrn, Bool motion, short vid_w, short vid_h, *p_w = drw_w & round; *p_h = drw_h & round; } -#endif static void A(XvMoveCB)(FBAreaPtr area1, FBAreaPtr area2) { @@ -903,7 +897,6 @@ A(PutImage)(ScrnInfoPtr pScrn, short src_x, short src_y, return Success; } -#ifndef IOP_ACCESS static int ApmQueryImageAttributes(ScrnInfoPtr pScrn, int id, unsigned short *w, unsigned short *h, @@ -949,5 +942,5 @@ common: return size; } -#endif + #endif |