github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:36:24 +01:00
Code Releases Activity

vo_gl[2]: Rename conflicting vo_ontop macro

Browse Source 
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).
This commit is contained in:
Uoti Urpala 2008-04-19 07:13:32 +03:00
parent 8ec90e5e4f
commit 6c9d09170d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvo/gl_common.h
View File

@ -284,14 +284,14 @@ void glDisableYUVConversion(GLenum target, int type);
#ifdef GL_WIN32 #ifdef GL_WIN32
#define vo_check_events() vo_w32_check_events() #define vo_check_events() vo_w32_check_events()
#define vo_fullscreen() vo_w32_fullscreen() #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() #define vo_uninit() vo_w32_uninit()
int setGlWindow(int *vinfo, HGLRC *context, HWND win); int setGlWindow(int *vinfo, HGLRC *context, HWND win);
void releaseGlContext(int *vinfo, HGLRC *context); void releaseGlContext(int *vinfo, HGLRC *context);
#else #else
#define vo_check_events() vo_x11_check_events(mDisplay) #define vo_check_events() vo_x11_check_events(mDisplay)
#define vo_fullscreen() vo_x11_fullscreen() #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() #define vo_uninit() vo_x11_uninit()
int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win); int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win);
void releaseGlContext(XVisualInfo **vinfo, GLXContext *context); void releaseGlContext(XVisualInfo **vinfo, GLXContext *context);

2
libvo/vo_gl.c
View File

@ -920,7 +920,7 @@ static int control(uint32_t request, void *data)
case VOCTRL_GUISUPPORT: case VOCTRL_GUISUPPORT:
return VO_TRUE; return VO_TRUE;
case VOCTRL_ONTOP: case VOCTRL_ONTOP:
vo_ontop(); vo_gl_ontop();
return VO_TRUE; return VO_TRUE;
case VOCTRL_FULLSCREEN: case VOCTRL_FULLSCREEN:
vo_fullscreen(); vo_fullscreen();

2
libvo/vo_gl2.c
View File

@ -877,7 +877,7 @@ static int control(uint32_t request, void *data)
case VOCTRL_GUISUPPORT: case VOCTRL_GUISUPPORT:
return VO_TRUE; return VO_TRUE;
case VOCTRL_ONTOP: case VOCTRL_ONTOP:
vo_ontop(); vo_gl_ontop();
return VO_TRUE; return VO_TRUE;
case VOCTRL_FULLSCREEN: case VOCTRL_FULLSCREEN:
vo_fullscreen(); vo_fullscreen();