X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Floop.c;h=e271951960fa97cf4fe97cc93d276e181f35e287;hp=f492ee44c4d92cf4224666e5d9591fd4b8125896;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=96a411663168b0ba5432b407a83be55f3df0c802 diff --git a/hacks/loop.c b/hacks/loop.c index f492ee44..e2719519 100644 --- a/hacks/loop.c +++ b/hacks/loop.c @@ -109,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 = @@ -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)