gistfile1.txt

commit 0668b21b15566e4fa9ecb16c6628b87664365bad
Author: Zeno Albisser <zeno@webkit.org>
Date:   Fri Jan 20 15:33:51 2012 +0100

    mac buildfix

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f388863..f5f9239 100755
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-20  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt][Mac] Buildfix: Properly cast return value to return type.
+
+        Reviewed by NOBODY (OOPS!).
+
+        * platform/graphics/cairo/OpenGLShims.cpp:
+        (WebCore::getProcAddress):
+
 2012-01-20  Alexis Menard  <alexis.menard@openbossa.org>
 
         remove CSSBorderImageValue
diff --git a/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp b/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
index 28316e0..2994cd2 100644
--- a/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
+++ b/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
@@ -42,7 +42,7 @@ OpenGLFunctionTable* openGLFunctionTable()
 #if PLATFORM(QT)
 static void* getProcAddress(const char* procName)
 {
-    return QGLContext::currentContext()->getProcAddress(QString::fromLatin1(procName));
+    return reinterpret_cast<void*>(QGLContext::currentContext()->getProcAddress(QString::fromLatin1(procName)));
 }
 #else
 typedef void* (*glGetProcAddressType) (const char* procName);