X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Ftangram_shapes.c;h=916d0a88735ba517b4261dcd0e4c2d49e1e307a2;hp=283c2ba40dda58b98a856d625d0c5ae9937bd314;hb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;hpb=ccb7f4903325f92555a9722bba74b58346654ba0

diff --git a/hacks/glx/tangram_shapes.c b/hacks/glx/tangram_shapes.c
index 283c2ba4..916d0a88 100644
--- a/hacks/glx/tangram_shapes.c
+++ b/hacks/glx/tangram_shapes.c
@@ -9,7 +9,13 @@
  * implied warranty.
  */
 
-#include <GL/gl.h>
+#ifdef HAVE_COCOA
+# include <OpenGL/gl.h>
+#else
+# include <GL/gl.h>
+#endif
+
+#include "tangram_shapes.h"
 
 #define small_scale  ( 1 )
 #define large_scale  ( 2 )
@@ -75,6 +81,7 @@ static void tri_45_90(int wire)
     glEnd();
 }
 
+static
 void unit_cube(int wire)
 {
     glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);
@@ -119,6 +126,7 @@ void unit_cube(int wire)
     glEnd();
 }
 
+static
 void unit_rhomboid(int wire)
 {
     glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);