[MPlayer-cvslog] r21647 - in trunk/libvo: gl_common.c vo_gl.c vo_gl2.c w32_common.c w32_common.h

[reimar]

Author: reimar
Date: Sun Dec 17 13:33:09 2006
New Revision: 21647

Modified:
   trunk/libvo/gl_common.c
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_gl2.c
   trunk/libvo/w32_common.c
   trunk/libvo/w32_common.h

Log:
Fix compilation under MinGW with X11 enabled

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	(original)
+++ trunk/libvo/gl_common.c	Sun Dec 17 13:33:09 2006
@@ -1338,7 +1338,7 @@
   }
 
   // set new values
-  vo_window = win;
+  vo_w32_window = win;
   vo_hdc = windc;
   {
     RECT rect;

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	(original)
+++ trunk/libvo/vo_gl.c	Sun Dec 17 13:33:09 2006
@@ -32,6 +32,9 @@
 #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;

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	(original)
+++ trunk/libvo/vo_gl2.c	Sun Dec 17 13:33:09 2006
@@ -52,6 +52,9 @@
 #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;

Modified: trunk/libvo/w32_common.c
==============================================================================
--- trunk/libvo/w32_common.c	(original)
+++ trunk/libvo/w32_common.c	Sun Dec 17 13:33:09 2006
@@ -29,6 +29,7 @@
 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 @@
     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 @@
     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 @@
     return createRenderingContext();
 }
 
-int vo_init(void) {
+int vo_w32_init(void) {
     HICON 	mplayerIcon = 0;
     char 	exedir[MAX_PATH];
     HINSTANCE	user32;

Modified: trunk/libvo/w32_common.h
==============================================================================
--- trunk/libvo/w32_common.h	(original)
+++ trunk/libvo/w32_common.h	Sun Dec 17 13:33:09 2006
@@ -3,17 +3,17 @@
 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);