http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.05.tar.gz

[xscreensaver] / hacks / glx / extrusion-twistoid.c

diff --git a/hacks/glx/extrusion-twistoid.c b/hacks/glx/extrusion-twistoid.c
index 2de65370f060d1433fddc3d21199bcfc43de9520..f5e4965e908dae9c2137a7ac340581598098a17c 100644 (file)
--- a/hacks/glx/extrusion-twistoid.c
+++ b/hacks/glx/extrusion-twistoid.c
@@ -12,11 +12,19 @@
  */
 
 /* required include files */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include <GL/gl.h>
-#include <GL/glut.h>
+/*#include <GL/glut.h>*/
+#ifdef HAVE_GLE3
+#include <GL/gle.h>
+#else
 #include <GL/tube.h>
+#endif
 
 /* Some <math.h> files do not define M_PI... */
 #ifndef M_PI
@@ -33,9 +41,9 @@ extern float rot_z;
 /* =========================================================== */
 
 #define NUM_TOID1_PTS 5
-double toid1_points[NUM_TOID1_PTS][3];
-float toid1_colors [NUM_TOID1_PTS][3];
-double toid1_twists [NUM_TOID1_PTS];
+static double toid1_points[NUM_TOID1_PTS][3];
+static float toid1_colors [NUM_TOID1_PTS][3];
+static double toid1_twists [NUM_TOID1_PTS];
 
 #define TSCALE (6.0)
 
@@ -58,7 +66,7 @@ double toid1_twists [NUM_TOID1_PTS];
    i++;                                                \
 }
 
-void init_toid1_line (void)
+static void init_toid1_line (void)
 {
    int i;
 
@@ -104,10 +112,10 @@ void init_toid1_line (void)
 
 #define NUM_TWIS_PTS (20)
 
-double twistation [NUM_TWIS_PTS][2];
-double twist_normal [NUM_TWIS_PTS][2];
+static double twistation [NUM_TWIS_PTS][2];
+static double twist_normal [NUM_TWIS_PTS][2];
 
-void init_tripples (void)
+static void init_tripples (void)
 {
    int i;
    double angle;