[Libreoffice-commits] core.git: vcl/source

Tor Lillqvist tml at collabora.com
Tue Jul 29 01:22:41 PDT 2014


 vcl/source/opengl/OpenGLContext.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit e9c5022580f14c0ca97503f8b3cc56b530fff174
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jul 29 11:21:38 2014 +0300

    Blind fix attempt for compiling against the 10.6 SDK
    
    Change-Id: I0ee5f4f709aa521d85974ebb6518d8f2bce3f513

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index ee916bb..c17bcac 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -475,7 +475,13 @@ bool OpenGLContext::ImplInit()
 #elif defined( MACOSX )
 
     CGLPixelFormatAttribute pixelFormatAttributes[] = {
+#ifdef kCGLPFAOpenGLProfile // Available in OS X 10.7 and later
         kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core,
+#else
+        // Will we then get run-time error on OS X < 10.7? Why can't
+        // we just require building against the 10.9 SDK or later, and
+        // running on 10.7 at least.
+#endif
         kCGLPFAColorSize, (CGLPixelFormatAttribute) 24,
         kCGLPFAAlphaSize, (CGLPixelFormatAttribute) 8,
         kCGLPFADoubleBuffer,


More information about the Libreoffice-commits mailing list