ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...

[xscreensaver] / hacks / loop.c

diff --git a/hacks/loop.c b/hacks/loop.c
index 04419801919d5681feb0379b49a574964022e3aa..e271951960fa97cf4fe97cc93d276e181f35e287 100644 (file)
--- a/hacks/loop.c
+++ b/hacks/loop.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* loop --- Chris Langton's self-producing loops */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)loop.c       5.01 2000/03/15 xlockmore";
-
 #endif
 
 /*-
@@ -110,17 +109,17 @@ static int  neighbors;
 
 static XrmOptionDescRec opts[] =
 {
-       {(char *) "-neighbors", (char *) ".loop.neighbors", XrmoptionSepArg, (caddr_t) NULL}
+       {"-neighbors", ".loop.neighbors", XrmoptionSepArg, 0}
 };
 
 static argtype vars[] =
 {
-       {(caddr_t *) & neighbors, (char *) "neighbors", (char *) "Neighbors", (char *) DEF_NEIGHBORS, t_Int}
+       {&neighbors, "neighbors", "Neighbors", DEF_NEIGHBORS, t_Int}
 };
 
 static OptionStruct desc[] =
 {
-       {(char *) "-neighbors num", (char *) "squares 4 or hexagons 6"}
+       {"-neighbors num", "squares 4 or hexagons 6"}
 };
 
 ModeSpecOpt loop_opts =
@@ -1426,6 +1425,9 @@ release_loop(ModeInfo * mi)
        }
 }
 
+static void *stop_warning_about_triangleUnit_already;
+
+
 void
 init_loop(ModeInfo * mi)
 {
@@ -1435,6 +1437,8 @@ init_loop(ModeInfo * mi)
        loopstruct *lp;
        XGCValues   gcv;
 
+    stop_warning_about_triangleUnit_already = (void *) &triangleUnit;
+
        if (loops == NULL) {
                if ((loops = (loopstruct *) calloc(MI_NUM_SCREENS(mi),
                                               sizeof (loopstruct))) == NULL)