Browse Source

hmm, contradictory requirements for placement of glgsg.h

David Rose 16 years ago
parent
commit
239676ffd6
1 changed files with 5 additions and 4 deletions
  1. 5 4
      panda/src/osxdisplay/osxGraphicsWindow.mm

+ 5 - 4
panda/src/osxdisplay/osxGraphicsWindow.mm

@@ -9,10 +9,6 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-// We have to include this before we include the system OpenGL/gl.h
-// file.
-#include "glgsg.h"
-
 // We include these system header files first, because there is a
 // namescope conflict between them and some other header file that
 // gets included later (in particular, TCP_NODELAY must not be a
@@ -24,6 +20,11 @@
 #include <OpenGL/gl.h>
 #include <AGL/agl.h>
 
+// We have to include this before we include the system OpenGL/gl.h
+// file, but after we include all of the above header files.  Deal
+// with this contradiction later.
+#include "glgsg.h"
+
 #include "osxGraphicsWindow.h"
 #include "config_osxdisplay.h"
 #include "osxGraphicsPipe.h"