X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fpipes.c;h=65e2b579740cb8913a60e4a6f7873de027f8a5e4;hp=db1e792daddef208426799d0d8eaa0f3028170a4;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=cccbddbc4140cf9a06d7d95cc5c0ca36eb5d6e28

diff --git a/hacks/glx/pipes.c b/hacks/glx/pipes.c
index db1e792d..65e2b579 100644
--- a/hacks/glx/pipes.c
+++ b/hacks/glx/pipes.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* pipes --- 3D selfbuiding pipe system */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)pipes.c	4.07 97/11/24 xlockmore";
-
 #endif
 
 /*-
@@ -43,13 +42,6 @@ static const char sccsid[] = "@(#)pipes.c	4.07 97/11/24 xlockmore";
  * 29-Apr-97: Efficiency speed-ups by Marcelo F. Vianna
  */
 
-/*-
- * 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>
-
 #ifdef STANDALONE
 # define PROGCLASS					"Pipes"
 # define HACK_INIT					init_pipes
@@ -89,23 +81,23 @@ static Bool dbuf_p;
 
 static XrmOptionDescRec opts[] =
 {
-	{"-factory", ".pipes.factory", XrmoptionSepArg, (caddr_t) NULL},
-	{"-fisheye", ".pipes.fisheye", XrmoptionNoArg, (caddr_t) "on"},
-	{"+fisheye", ".pipes.fisheye", XrmoptionNoArg, (caddr_t) "off"},
-	{"-tightturns", ".pipes.tightturns", XrmoptionNoArg, (caddr_t) "on"},
-	{"+tightturns", ".pipes.tightturns", XrmoptionNoArg, (caddr_t) "off"},
-      {"-rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, (caddr_t) "on"},
-      {"+rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, (caddr_t) "off"},
-      {"-db", ".pipes.doubleBuffer", XrmoptionNoArg, (caddr_t) "on"},
-      {"+db", ".pipes.doubleBuffer", XrmoptionNoArg, (caddr_t) "off"},
+	{"-factory", ".pipes.factory", XrmoptionSepArg, 0},
+	{"-fisheye", ".pipes.fisheye", XrmoptionNoArg, "on"},
+	{"+fisheye", ".pipes.fisheye", XrmoptionNoArg, "off"},
+	{"-tightturns", ".pipes.tightturns", XrmoptionNoArg, "on"},
+	{"+tightturns", ".pipes.tightturns", XrmoptionNoArg, "off"},
+      {"-rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, "on"},
+      {"+rotatepipes", ".pipes.rotatepipes", XrmoptionNoArg, "off"},
+      {"-db", ".pipes.doubleBuffer", XrmoptionNoArg, "on"},
+      {"+db", ".pipes.doubleBuffer", XrmoptionNoArg, "off"},
 };
 static argtype vars[] =
 {
-	{(caddr_t *) & factory, "factory", "Factory", DEF_FACTORY, t_Int},
-	{(caddr_t *) & fisheye, "fisheye", "Fisheye", DEF_FISHEYE, t_Bool},
-	{(caddr_t *) & tightturns, "tightturns", "Tightturns", DEF_TIGHTTURNS, t_Bool},
-	{(caddr_t *) & rotatepipes, "rotatepipes", "Rotatepipes", DEF_ROTATEPIPES, t_Bool},
-	{(caddr_t *) & dbuf_p, "doubleBuffer", "DoubleBuffer", DEF_DBUF, t_Bool}
+	{&factory, "factory", "Factory", DEF_FACTORY, t_Int},
+	{&fisheye, "fisheye", "Fisheye", DEF_FISHEYE, t_Bool},
+	{&tightturns, "tightturns", "Tightturns", DEF_TIGHTTURNS, t_Bool},
+	{&rotatepipes, "rotatepipes", "Rotatepipes", DEF_ROTATEPIPES, t_Bool},
+	{&dbuf_p, "doubleBuffer", "DoubleBuffer", DEF_DBUF, t_Bool}
 };
 static OptionStruct desc[] =
 {