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_x11.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_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 85a975944a..5f139287d2 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -11,7 +11,7 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM #include <X11/extensions/xf86vmode.h> #endif #include <errno.h> @@ -317,7 +317,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, unsigned long xswamask; const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM unsigned int modeline_width, modeline_height; static uint32_t vm_width; static uint32_t vm_height; @@ -375,7 +375,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, else #endif { -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if (vm) { if ((d_width == 0) && (d_height == 0)) @@ -405,7 +405,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, xswa.colormap = theCmap; xswamask = CWBackPixel | CWBorderPixel | CWColormap; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if (vm) { xswa.override_redirect = True; @@ -452,7 +452,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, ButtonReleaseMask | PointerMotionMask))); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM if (vm) { /* Grab the mouse pointer in our window */ @@ -725,7 +725,7 @@ static void uninit(void) freeMyXImage(); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM vo_vm_close(mDisplay); #endif |