From 05db92a86c2cb164e8fcf2eca069746bd47025e3 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 7 Jan 2006 19:56:55 +0000
Subject: avoid some gcc 4 compiler warnings

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17337 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/gl_common.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libvo')

diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 8b5a0047e1..750c904c80 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -289,7 +289,7 @@ static const extfunc_desc_t extfuncs[] = {
 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 @@ void swapGlBuffers() {
  *
  * 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 @@ int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win)
   {
     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 @@ int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win)
     if (!getProcAddress)
       getProcAddress = getdladdr("glXGetProcAddressARB");
     if (!getProcAddress)
-      getProcAddress = getdladdr;
+      getProcAddress = (void *)getdladdr;
     glXExtStr = getdladdr("glXQueryExtensionsString");
     getFunctions(getProcAddress, !glXExtStr ? NULL :
                  glXExtStr(mDisplay, DefaultScreen(mDisplay)));
-- 
cgit v1.2.3