From 6c9d09170d70df6e915b6e98906b7625c0c52c64 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 19 Apr 2008 07:13:32 +0300 Subject: vo_gl[2]: Rename conflicting vo_ontop macro Rename the vo_ontop() macro to vo_gl_ontop(). It caused problems with other changes because it conflicts with a global variable name (gl2 actually called vo_ontop() as a function and used vo_ontop as an int - this only worked because vo_ontop was defined as a function-like macro and use without parentheses didn't trigger replacement). --- libvo/gl_common.h | 4 ++-- libvo/vo_gl.c | 2 +- libvo/vo_gl2.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 66fc2fe799..05d1bde862 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -284,14 +284,14 @@ void glDisableYUVConversion(GLenum target, int type); #ifdef GL_WIN32 #define vo_check_events() vo_w32_check_events() #define vo_fullscreen() vo_w32_fullscreen() -#define vo_ontop() vo_w32_ontop() +#define vo_gl_ontop() vo_w32_ontop() #define vo_uninit() vo_w32_uninit() int setGlWindow(int *vinfo, HGLRC *context, HWND win); void releaseGlContext(int *vinfo, HGLRC *context); #else #define vo_check_events() vo_x11_check_events(mDisplay) #define vo_fullscreen() vo_x11_fullscreen() -#define vo_ontop() vo_x11_ontop() +#define vo_gl_ontop() vo_x11_ontop() #define vo_uninit() vo_x11_uninit() int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win); void releaseGlContext(XVisualInfo **vinfo, GLXContext *context); diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 036974cb69..82e27c8b62 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -920,7 +920,7 @@ static int control(uint32_t request, void *data) case VOCTRL_GUISUPPORT: return VO_TRUE; case VOCTRL_ONTOP: - vo_ontop(); + vo_gl_ontop(); return VO_TRUE; case VOCTRL_FULLSCREEN: vo_fullscreen(); diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 735e29195f..22fd598499 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -877,7 +877,7 @@ static int control(uint32_t request, void *data) case VOCTRL_GUISUPPORT: return VO_TRUE; case VOCTRL_ONTOP: - vo_ontop(); + vo_gl_ontop(); return VO_TRUE; case VOCTRL_FULLSCREEN: vo_fullscreen(); -- cgit v1.2.3