From http://www.jwz.org/xscreensaver/xscreensaver-5.16.tar.gz

[xscreensaver] / hacks / glx / tangram_shapes.c

diff --git a/hacks/glx/tangram_shapes.c b/hacks/glx/tangram_shapes.c
index 283c2ba40dda58b98a856d625d0c5ae9937bd314..32b7014c51bee5485352daea84ebc01e938a04c0 100644 (file)
--- a/hacks/glx/tangram_shapes.c
+++ b/hacks/glx/tangram_shapes.c
@@ -9,7 +9,19 @@
  * implied warranty.
  */
 
-#include <GL/gl.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifndef HAVE_COCOA
+# include <GL/gl.h>
+#endif
+
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
+#include "tangram_shapes.h"
 
 #define small_scale  ( 1 )
 #define large_scale  ( 2 )
@@ -75,6 +87,7 @@ static void tri_45_90(int wire)
     glEnd();
 }
 
+static
 void unit_cube(int wire)
 {
     glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);
@@ -119,6 +132,7 @@ void unit_cube(int wire)
     glEnd();
 }
 
+static
 void unit_rhomboid(int wire)
 {
     glBegin((wire) ? GL_LINE_LOOP : GL_QUADS);