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/x11_common.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/x11_common.c')
-rw-r--r-- | libvo/x11_common.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 97cc1e4a0b..65b88cb307 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -26,27 +26,27 @@ #include <X11/Xutil.h> #include <X11/Xatom.h> -#ifdef HAVE_XSS +#ifdef CONFIG_XSS #include <X11/extensions/scrnsaver.h> #endif -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS #include <X11/extensions/dpms.h> #endif -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA #include <X11/extensions/Xinerama.h> #endif -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM #include <X11/extensions/xf86vmode.h> #endif -#ifdef HAVE_XF86XK +#ifdef CONFIG_XF86XK #include <X11/XF86keysym.h> #endif -#ifdef HAVE_XV +#ifdef CONFIG_XV #include <X11/extensions/Xv.h> #include <X11/extensions/Xvlib.h> @@ -112,7 +112,7 @@ static int vo_old_y = 0; static int vo_old_width = 0; static int vo_old_height = 0; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM XF86VidModeModeInfo **vidmodes = NULL; XF86VidModeModeLine modeline; #endif @@ -369,7 +369,7 @@ static void init_atoms(void) void update_xinerama_info(void) { int screen = xinerama_screen; xinerama_x = xinerama_y = 0; -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA if (screen >= -1 && XineramaIsActive(mDisplay)) { XineramaScreenInfo *screens; @@ -450,7 +450,7 @@ int vo_init(void) init_atoms(); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM { int clock; @@ -1615,7 +1615,7 @@ void xscreensaver_heartbeat(void) static int xss_suspend(Bool suspend) { -#ifndef HAVE_XSS +#ifndef CONFIG_XSS return 0; #else int event, error, major, minor; @@ -1641,7 +1641,7 @@ void saver_on(Display * mDisplay) screensaver_off = 0; if (xss_suspend(False)) return; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if (dpms_disabled) { int nothing; @@ -1682,7 +1682,7 @@ void saver_off(Display * mDisplay) screensaver_off = 1; if (xss_suspend(True)) return; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) { BOOL onoff; @@ -1754,7 +1754,7 @@ void vo_x11_selectinput_witherr(Display * display, Window w, } } -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM void vo_vm_switch(uint32_t X, uint32_t Y, int *modeline_width, int *modeline_height) { @@ -2044,7 +2044,7 @@ uint32_t vo_x11_get_equalizer(char *name, int *value) return VO_TRUE; } -#ifdef HAVE_XV +#ifdef CONFIG_XV int vo_xv_set_eq(uint32_t xv_port, char *name, int value) { XvAttribute *attributes; |