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

[Zolnai Tamás]

 vcl/source/opengl/OpenGLContext.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1bf5639cb30cfc133f8ca30b3a54074ae4a0527a
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sun Apr 27 12:47:52 2014 +0200

    Fix mac build: explicitly check all platforms inside swapBuffers
    
    Plus some cosmetics
    
    Change-Id: I42d989217a0b40a8a6a03c0ebc6c4aa14b34d387

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 107bcf0..4daae1c 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -586,7 +586,7 @@ bool OpenGLContext::initWindow()
     return true;
 }
 
-#elif defined( MACOSX ) || defined( IOS) || defined( ANDROID )
+#elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
 
 bool OpenGLContext::initWindow()
 {
@@ -648,7 +648,7 @@ bool OpenGLContext::initWindow()
 
 #endif
 
-#if defined( WNT ) || defined( MACOSX ) || defined( IOS) || defined( ANDROID )
+#if defined( WNT ) || defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
 
 SystemWindowData OpenGLContext::generateWinData(Window* /*pParent*/)
 {
@@ -752,8 +752,10 @@ SystemWindowData OpenGLContext::generateWinData(Window* pParent)
 
 void OpenGLContext::swapBuffers()
 {
-#if defined( _WIN32 )
+#if defined( WNT )
     SwapBuffers(m_aGLWin.hDC);
+#elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
+    // nothing
 #elif defined( UNX )
     glXSwapBuffers(m_aGLWin.dpy, m_aGLWin.win);
 #endif