X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fapollonian.c;h=ad46b1a2c7908f0e079eba448e8cee8373e04ee1;hp=4befef4e7de6b512ae92ae68fab3322ca02386e4;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3

diff --git a/hacks/apollonian.c b/hacks/apollonian.c
index 4befef4e..ad46b1a2 100644
--- a/hacks/apollonian.c
+++ b/hacks/apollonian.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* apollonian --- Apollonian Circles */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)apollonian.c	5.02 2001/07/01 xlockmore";
 #endif
 
@@ -90,20 +90,20 @@ static Bool label;
 
 static XrmOptionDescRec opts[] =
 {
-	{(char *) "-altgeom", (char *) ".apollonian.altgeom", XrmoptionNoArg, (caddr_t) "on"},
-	{(char *) "+altgeom", (char *) ".apollonian.altgeom", XrmoptionNoArg, (caddr_t) "off"},
-	{(char *) "-label", (char *) ".apollonian.label", XrmoptionNoArg, (caddr_t) "on"},
-	{(char *) "+label", (char *) ".apollonian.label", XrmoptionNoArg, (caddr_t) "off"},
+	{"-altgeom", ".apollonian.altgeom", XrmoptionNoArg, "on"},
+	{"+altgeom", ".apollonian.altgeom", XrmoptionNoArg, "off"},
+	{"-label", ".apollonian.label", XrmoptionNoArg, "on"},
+	{"+label", ".apollonian.label", XrmoptionNoArg, "off"},
 };
 static argtype vars[] =
 {
-	{(caddr_t *) & altgeom, (char *) "altgeom", (char *) "AltGeom", (char *) DEF_ALTGEOM, t_Bool},
-	{(caddr_t *) & label, (char *) "label", (char *) "Label", (char *) DEF_LABEL, t_Bool},
+	{&altgeom, "altgeom", "AltGeom", DEF_ALTGEOM, t_Bool},
+	{&label,   "label",   "Label",   DEF_LABEL,   t_Bool},
 };
 static OptionStruct desc[] =
 {
-        {(char *) "-/+altgeom", (char *) "turn on/off alternate geometries (off euclidean space, on includes spherical and hyperbolic)"},
-        {(char *) "-/+label", (char *) "turn on/off alternate space and number labeling"},
+        {"-/+altgeom", "turn on/off alternate geometries (off euclidean space, on includes spherical and hyperbolic)"},
+        {"-/+label", "turn on/off alternate space and number labeling"},
 };
 
 ModeSpecOpt apollonian_opts =