[MPlayer-cvslog] CVS: main/libvo gl_common.c,1.38,1.39

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv28089

Modified Files:
	gl_common.c 
Log Message:
avoid some gcc 4 compiler warnings


Index: gl_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/gl_common.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gl_common.c	7 Jan 2006 19:53:51 -0000	1.38
+++ gl_common.c	7 Jan 2006 19:56:55 -0000	1.39
@@ -289,7 +289,7 @@
 static void getFunctions(void *(*getProcAddress)(const GLubyte *),
                          const char *ext2) {
   const extfunc_desc_t *dsc;
-  const char *extensions = glGetString(GL_EXTENSIONS);
+  const char *extensions = (const char *)glGetString(GL_EXTENSIONS);
   char *allexts;
   if (!extensions) extensions = "";
   if (!ext2) ext2 = "";
@@ -1015,7 +1015,7 @@
  *
  * Copied from xine
  */
-static void *getdladdr(const GLubyte *s) {
+static void *getdladdr(const char *s) {
 #ifdef HAVE_LIBDL
 #if defined(__sun) || defined(__sgi)
   static void *handle = dlopen(NULL, RTLD_LAZY);
@@ -1097,8 +1097,9 @@
   {
     Window root;
     int tmp;
+    unsigned utmp;
     XGetGeometry(mDisplay, vo_window, &root, &tmp, &tmp,
-                  &vo_dwidth, &vo_dheight, &tmp, &tmp);
+        (unsigned *)&vo_dwidth, (unsigned *)&vo_dheight, &utmp, &utmp);
   }
   if (!keep_context) {
     void *(*getProcAddress)(const GLubyte *);
@@ -1113,7 +1114,7 @@
     if (!getProcAddress)
       getProcAddress = getdladdr("glXGetProcAddressARB");
     if (!getProcAddress)
-      getProcAddress = getdladdr;
+      getProcAddress = (void *)getdladdr;
     glXExtStr = getdladdr("glXQueryExtensionsString");
     getFunctions(getProcAddress, !glXExtStr ? NULL :
                  glXExtStr(mDisplay, DefaultScreen(mDisplay)));