diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2007-04-20 16:24:15 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2007-04-20 16:24:15 -0700 |
| commit | 4ff648c85f8aa90b343b7e2df176c0511b3cdaa5 (patch) | |
| tree | c599ed02adc4fcb25db4473202a1a933f436e888 /src/nv_video.c | |
| parent | 48f9a6f94550acea4fce81d2539a6508049c1551 (diff) | |
Depend on server 1.2 or higher.randr-1.2
Remove support for building with the libc wrapper or without the Drawable XV
argument.
Diffstat (limited to 'src/nv_video.c')
| -rw-r--r-- | src/nv_video.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/nv_video.c b/src/nv_video.c index 1a428fb..c9ee5fe 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -7,9 +7,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Resources.h" -#if USE_LIBC_WRAPPER -#include "xf86_ansic.h" -#endif #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" @@ -83,11 +80,7 @@ static int NVGetBlitPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer); static void NVStopOverlayVideo(ScrnInfoPtr, pointer, Bool); static void NVStopBlitVideo(ScrnInfoPtr, pointer, Bool); -#if HAVE_XV_DRAWABLE static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr); -#else -static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer); -#endif static void NVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer); static int NVQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *); @@ -1012,10 +1005,8 @@ static int NVPutImage short height, Bool Sync, RegionPtr clipBoxes, - pointer data -#if HAVE_XV_DRAWABLE - , DrawablePtr pDraw -#endif + pointer data, + DrawablePtr pDraw ) { NVPortPrivPtr pPriv = (NVPortPrivPtr)data; |