5 files changed, 14 insertions, 7 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index ae28b79bfd..f845521c78 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -1338,7 +1338,7 @@ int setGlWindow(int *vinfo, HGLRC *context, HWND win)
   }
 
   // set new values
-  vo_window = win;
+  vo_w32_window = win;
   vo_hdc = windc;
   {
     RECT rect;
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 4657363765..43c9d005e2 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -32,6 +32,9 @@ LIBVO_EXTERN(gl)
 #ifdef GL_WIN32
 static int gl_vinfo = 0;
 static HGLRC gl_context = 0;
+#define update_xinerama_info w32_update_xinerama_info
+#define vo_init vo_w32_init
+#define vo_window vo_w32_window
 #else
 static XVisualInfo *gl_vinfo = NULL;
 static GLXContext gl_context = 0;
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 9a9bbac2f2..d50ae88b15 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -52,6 +52,9 @@ static unsigned char *ImageData=NULL;
 #ifdef GL_WIN32
     static int gl_vinfo = 0;
     static HGLRC gl_context = 0;
+#define update_xinerama_info w32_update_xinerama_info
+#define vo_init vo_w32_init
+#define vo_window vo_w32_window
 #else
     static XVisualInfo *gl_vinfo = NULL;
     static GLXContext gl_context = 0;
diff --git a/libvo/w32_common.c b/libvo/w32_common.c
index eec817d68f..1e2397d406 100644
--- a/libvo/w32_common.c
+++ b/libvo/w32_common.c
@@ -29,6 +29,7 @@ uint32_t o_dwidth;
 uint32_t o_dheight;
 
 static HINSTANCE hInstance;
+#define vo_window vo_w32_window
 HWND vo_window = 0;
 static int event_flags;
 static int mon_cnt;
@@ -147,7 +148,7 @@ static BOOL CALLBACK mon_enum(HMONITOR hmon, HDC hdc, LPRECT r, LPARAM p) {
     return TRUE;
 }
 
-void update_xinerama_info(void) {
+void w32_update_xinerama_info(void) {
     xinerama_x = xinerama_y = 0;
     if (xinerama_screen < -1) {
         int tmp;
@@ -186,7 +187,7 @@ static void updateScreenProperties() {
     vo_screenwidth = dm.dmPelsWidth;
     vo_screenheight = dm.dmPelsHeight;
     vo_depthonscreen = dm.dmBitsPerPel;
-    update_xinerama_info();
+    w32_update_xinerama_info();
 }
 
 static void changeMode(void) {
@@ -310,7 +311,7 @@ int vo_w32_config(uint32_t width, uint32_t height, uint32_t flags) {
     return createRenderingContext();
 }
 
-int vo_init(void) {
+int vo_w32_init(void) {
     HICON 	mplayerIcon = 0;
     char 	exedir[MAX_PATH];
     HINSTANCE	user32;
diff --git a/libvo/w32_common.h b/libvo/w32_common.h
index 531d56a549..6d657d6b88 100644
--- a/libvo/w32_common.h
+++ b/libvo/w32_common.h
@@ -3,17 +3,17 @@ extern int vo_screenwidth;
 extern int vo_screenheight;
 extern uint32_t o_dwidth;
 extern uint32_t o_dheight;
-extern HWND vo_window;
+extern HWND vo_w32_window;
 extern HDC vo_hdc;
 extern int vo_fs;
 extern int vo_vm;
 extern int vo_ontop;
 
-extern int vo_init(void);
+extern int vo_w32_init(void);
 extern void vo_w32_uninit(void);
 extern void vo_w32_ontop(void);
 extern void vo_w32_fullscreen(void);
 extern int vo_w32_check_events(void);
 extern int vo_w32_config(uint32_t, uint32_t, uint32_t);
 extern void destroyRenderingContext(void);
-extern void update_xinerama_info(void);
+extern void w32_update_xinerama_info(void);