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

[Michael Meeks]

 chart2/source/view/main/OpenGLRender.hxx |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 0b9207bf8cfc83e25189d3a0e8d3c82d8ce988c4
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Feb 3 19:28:59 2014 +0100

    chart2: resolve merge conflict.
    
    Change-Id: I5823d03af1eda3963c4ac52b60949402ca81f747

diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 3dc1077..18176f6 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -9,22 +9,21 @@
 
 #if defined( MACOSX )
 #elif defined( UNX )
-#if defined( UNX )
-#include <prex.h>
-#include "GL/glxew.h"
-#include <postx.h>
+#  include <prex.h>
+#  include "GL/glxew.h"
+#  include <postx.h>
 #elif defined( _WIN32 )
-#include "prewin.h"
-#include "windows.h"
-#include "postwin.h"
+#  include "prewin.h"
+#  include "windows.h"
+#  include "postwin.h"
 #endif
 
 #if defined( MACOSX )
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
+#  include <OpenGL/gl.h>
+#  include <OpenGL/glu.h>
 #else
-#include <GL/gl.h>
-#include <GL/glu.h>
+#  include <GL/gl.h>
+#  include <GL/glu.h>
 #endif
 
 #include <vcl/window.hxx>