From 5f26d6ec995b185342bba324f83ec77002557019 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 27 Apr 2009 06:26:41 +0000 Subject: [PATCH] Attempt to fix mingw warnings --- src/osg/GLExtensions.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osg/GLExtensions.cpp b/src/osg/GLExtensions.cpp index 304b164ab..e02e24dcc 100644 --- a/src/osg/GLExtensions.cpp +++ b/src/osg/GLExtensions.cpp @@ -111,12 +111,12 @@ bool osg::isGLExtensionOrVersionSupported(unsigned int contextID, const char *ex // add WGL extensions to the list typedef const char* WINAPI WGLGETEXTENSIONSSTRINGARB(HDC); - WGLGETEXTENSIONSSTRINGARB* wglGetExtensionsStringARB = - (WGLGETEXTENSIONSSTRINGARB*)getGLExtensionFuncPtr("wglGetExtensionsStringARB"); + WGLGETEXTENSIONSSTRINGARB* wglGetExtensionsStringARB = 0; + setGLExtensionsFuncPtr(wglGetExtensionsStringARB, "wglGetExtensionsStringARB"); typedef const char* WINAPI WGLGETEXTENSIONSSTRINGEXT(); - WGLGETEXTENSIONSSTRINGEXT* wglGetExtensionsStringEXT = - (WGLGETEXTENSIONSSTRINGEXT*)getGLExtensionFuncPtr("wglGetExtensionsStringEXT"); + WGLGETEXTENSIONSSTRINGEXT* wglGetExtensionsStringEXT = 0; + setGLExtensionsFuncPtr(wglGetExtensionsStringEXT, "wglGetExtensionsStringEXT"); const char* wglextensions = 0; @@ -312,7 +312,7 @@ void* osg::getGLExtensionFuncPtr(const char *funcName) { #if defined(WIN32) - return (void*)wglGetProcAddress(funcName); + return convertPointerType(wglGetProcAddress(funcName)); #elif defined(__APPLE__)