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 a30d3213b36c09384fcb4c7fcb5c339aaa2da6da..e271951960fa97cf4fe97cc93d276e181f35e287 100644 (file)
--- a/hacks/loop.c
+++ b/hacks/loop.c
@@ -109,7 +109,7 @@ static int  neighbors;
 
 static XrmOptionDescRec opts[] =
 {
-       {(char *) "-neighbors", (char *) ".loop.neighbors", XrmoptionSepArg, (caddr_t) NULL}
+       {"-neighbors", ".loop.neighbors", XrmoptionSepArg, 0}
 };
 
 static argtype vars[] =
@@ -119,7 +119,7 @@ static argtype vars[] =
 
 static OptionStruct desc[] =
 {
-       {(char *) "-neighbors num", (char *) "squares 4 or hexagons 6"}
+       {"-neighbors num", "squares 4 or hexagons 6"}
 };
 
 ModeSpecOpt loop_opts =
@@ -1425,6 +1425,9 @@ release_loop(ModeInfo * mi)
        }
 }
 
+static void *stop_warning_about_triangleUnit_already;
+
+
 void
 init_loop(ModeInfo * mi)
 {
@@ -1434,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)