diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-04 06:16:23 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-04 06:16:23 +0000 |
| commit | 82f319af620ae1e9c8b983d37b038b591575493c (patch) | |
| tree | 3d254bb15ef6cf0240246eccfea371ea5d33ccaf /libvo/vo_xvmc.c | |
| parent | 2776119d831edac39c49094291d2ac11752512a2 (diff) | |
| download | mpv-82f319af620ae1e9c8b983d37b038b591575493c.tar.bz2 mpv-82f319af620ae1e9c8b983d37b038b591575493c.tar.xz | |
Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xvmc.c')
| -rw-r--r-- | libvo/vo_xvmc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 55ebec49fc..3ad41b5ac9 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -38,7 +38,7 @@ #include "libavutil/common.h" //no chance for xinerama to be supported in the near future -#undef HAVE_XINERAMA +#undef CONFIG_XINERAMA #undef NDEBUG #include <assert.h> @@ -463,7 +463,7 @@ XSetWindowAttributes xswa; XWindowAttributes attribs; unsigned long xswamask; int depth; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM int vm=0; unsigned int modeline_width, modeline_height; static uint32_t vm_width; @@ -641,7 +641,7 @@ skip_surface_allocation: vo_mouse_autohide = 1; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if( flags&VOFLAG_MODESWITCHING ) vm = 1; #endif @@ -655,7 +655,7 @@ skip_surface_allocation: hint.y = vo_dy; hint.width = d_width; hint.height = d_height; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if ( vm ) { if ((d_width==0) && (d_height==0)) @@ -707,7 +707,7 @@ skip_surface_allocation: if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &xgcv); XSync(mDisplay, False); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if ( vm ) { /* Grab the mouse pointer in our window */ @@ -1153,7 +1153,7 @@ static void uninit(void){ printf("vo_xvmc: uninit called\n"); } xvmc_free(); //from vo_xv -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM vo_vm_close(mDisplay); #endif vo_x11_uninit(); |