From c9c329e7c4b3b752d0519209fc0aa026e06f7d4f Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 20 Dec 2010 12:17:40 +0000
Subject: [PATCH] Moved the GL3 include to within the code block that handles
 GL1/GL2

---
 include/osg/GL | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/osg/GL b/include/osg/GL
index 585343a70..17e95c5ed 100644
--- a/include/osg/GL
+++ b/include/osg/GL
@@ -37,14 +37,6 @@
          #include <GLES2/gl2.h>
     #endif
 
-#elif defined(OSG_GL3_AVAILABLE)
-
-    #define GL3_PROTOTYPES 1
-    #include <GL3/gl3.h>
-
-    #ifndef GL_APIENTRY
-        #define GL_APIENTRY APIENTRY
-    #endif // GL_APIENTRY
 
 #else
 
@@ -111,14 +103,21 @@
 
     #endif // WIN32
 
-    #ifndef __gl_h_
-        #ifdef __APPLE__
-            #include <OpenGL/gl.h>
-        #else
-            #include <GL/gl.h>
+    #if defined(OSG_GL3_AVAILABLE)
+
+        #define GL3_PROTOTYPES 1
+        #include <GL3/gl3.h>
+
+    #else
+        #ifndef __gl_h_
+            #ifdef __APPLE__
+                #include <OpenGL/gl.h>
+            #else
+                #include <GL/gl.h>
+            #endif
         #endif
     #endif
-    
+
     #ifndef GL_APIENTRY
         #define GL_APIENTRY APIENTRY
     #endif // GL_APIENTRY