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

[xscreensaver] / hacks / glx / rubik.c

diff --git a/hacks/glx/rubik.c b/hacks/glx/rubik.c
index 034122c5ae9de26bd54ed666e7265f86b829a631..ee21be9a4ecffba1cf3b61b34ada63cd27960bbf 100644 (file)
--- a/hacks/glx/rubik.c
+++ b/hacks/glx/rubik.c
@@ -103,14 +103,6 @@ static const char sccsid[] = "@(#)rubik.c  5.01 2001/03/01 xlockmore";
  *  BOTTOM => X, Z
  */
 
-#ifdef VMS
-/*-
- * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock.
- * otherwise caddr_t is not defined correctly
- */
-#include <X11/Intrinsic.h>
-#endif
-
 #ifdef STANDALONE
 # define MODE_rubik
 # define PROGCLASS     "Rubik"
@@ -143,27 +135,27 @@ static Bool hideshuffling;
 
 static XrmOptionDescRec opts[] =
 {
-        {(char *) "-sizex", (char *) ".rubik.sizex", XrmoptionSepArg, (caddr_t) NULL},
-        {(char *) "-sizey", (char *) ".rubik.sizey", XrmoptionSepArg, (caddr_t) NULL},
-        {(char *) "-sizez", (char *) ".rubik.sizez", XrmoptionSepArg, (caddr_t) NULL},
-       {(char *) "-hideshuffling", (char *) ".rubik.hideshuffling", XrmoptionNoArg, (caddr_t) "on"},
-       {(char *) "+hideshuffling", (char *) ".rubik.hideshuffling", XrmoptionNoArg, (caddr_t) "off"}
+        {"-sizex", ".rubik.sizex", XrmoptionSepArg, 0},
+        {"-sizey", ".rubik.sizey", XrmoptionSepArg, 0},
+        {"-sizez", ".rubik.sizez", XrmoptionSepArg, 0},
+       {"-hideshuffling", ".rubik.hideshuffling", XrmoptionNoArg, "on"},
+       {"+hideshuffling", ".rubik.hideshuffling", XrmoptionNoArg, "off"}
 };
 
 static argtype vars[] =
 {
-       {(caddr_t *) & sizex, (char *) "sizex", (char *) "SizeX", (char *) DEF_SIZEX, t_Int},
-       {(caddr_t *) & sizey, (char *) "sizey", (char *) "SizeY", (char *) DEF_SIZEY, t_Int},
-       {(caddr_t *) & sizez, (char *) "sizez", (char *) "SizeZ", (char *) DEF_SIZEZ, t_Int},
-       {(caddr_t *) & hideshuffling, (char *) "hideshuffling", (char *) "Hideshuffling", (char *) DEF_HIDESHUFFLING, t_Bool}
+       {&sizex, "sizex", "SizeX", DEF_SIZEX, t_Int},
+       {&sizey, "sizey", "SizeY", DEF_SIZEY, t_Int},
+       {&sizez, "sizez", "SizeZ", DEF_SIZEZ, t_Int},
+       {&hideshuffling, "hideshuffling", "Hideshuffling", DEF_HIDESHUFFLING, t_Bool}
 };
 
 static OptionStruct desc[] =
 {
-       {(char *) "-sizex num", (char *) "number of cubies along x axis (overrides size)"},
-       {(char *) "-sizey num", (char *) "number of cubies along y axis (overrides size)"},
-       {(char *) "-sizez num", (char *) "number of cubies along z axis (overrides size)"},
-       {(char *) "-/+hideshuffling", (char *) "turn on/off hidden shuffle phase"}
+       {"-sizex num", "number of cubies along x axis (overrides size)"},
+       {"-sizey num", "number of cubies along y axis (overrides size)"},
+       {"-sizez num", "number of cubies along z axis (overrides size)"},
+       {"-/+hideshuffling", "turn on/off hidden shuffle phase"}
 };
 
 ModeSpecOpt rubik_opts =