[brlcad-commits] SF.net SVN: brlcad:[45045] brlcad/trunk/src/libdm/dm-ogl.c

[<br...@us...>]

Revision: 45045
          http://brlcad.svn.sourceforge.net/brlcad/?rev=45045&view=rev
Author:   brlcad
Date:     2011-06-15 20:51:56 +0000 (Wed, 15 Jun 2011)

Log Message:
-----------
GL/gl.h needs the same protection as glx.h did.  encountered y1 shadow warnings on mac 10.5, gcc4.0.1

Modified Paths:
--------------
    brlcad/trunk/src/libdm/dm-ogl.c

Modified: brlcad/trunk/src/libdm/dm-ogl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ogl.c	2011-06-15 20:30:30 UTC (rev 45044)
+++ brlcad/trunk/src/libdm/dm-ogl.c	2011-06-15 20:51:56 UTC (rev 45045)
@@ -58,15 +58,15 @@
 #ifdef HAVE_GL_GLX_H
 #  include <GL/glx.h>
 #endif
+#ifdef HAVE_GL_GL_H
+#  include <GL/gl.h>
+#endif
 #undef remainder
 #undef access
 #undef index
 #undef read
 #undef y1
 #undef j1
-#ifdef HAVE_GL_GL_H
-#  include <GL/gl.h>
-#endif
 
 #include "tk.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.