ftp://ftp.jp.xemacs.org/pub/NetBSD/packages/distfiles/xscreensaver-4.15.tar.gz

[xscreensaver] / hacks / glx / atunnel.c

diff --git a/hacks/glx/atunnel.c b/hacks/glx/atunnel.c
index 74a64b5b93f55e57150ba779b440229984719243..966b1be3c29c69dad17face448b823426ae7b3b2 100644 (file)
--- a/hacks/glx/atunnel.c
+++ b/hacks/glx/atunnel.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* atunnels --- OpenGL Advanced Tunnel Screensaver */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)atunnels.c   5.07 2003/02/12 xlockmore";
 #endif
 
@@ -61,8 +61,8 @@ static const char sccsid[] = "@(#)atunnels.c  5.07 2003/02/12 xlockmore";
 #include <math.h>
 #include "tunnel_draw.h"
 
-#if defined( USE_XPM ) || defined( USE_XPMINC ) || defined( HAVE_XPM )
-/* USE_XPM & USE_XPMINC in xlock mode ; HAVE_XPM in xscreensaver mode */
+#if defined( USE_XPM ) || defined( USE_XPMINC ) || defined(STANDALONE)
+/* USE_XPM & USE_XPMINC in xlock mode ; STANDALONE in xscreensaver mode */
 #include "xpm-ximage.h"
 #define I_HAVE_XPM
 
@@ -98,9 +98,9 @@ static XrmOptionDescRec opts[] = {
 };
 
 static argtype vars[] = {
-  {(caddr_t *) &do_light,   (char *)"light",  (char *)"Light",   DEF_LIGHT,   t_Bool},
-  {(caddr_t *) &do_wire,    (char *)"wire",   (char *)"Wire",    DEF_WIRE,    t_Bool},
-  {(caddr_t *) &do_texture, (char *)"texture",(char *)"Texture", DEF_TEXTURE, t_Bool},
+  {&do_light,   "light",   "Light",   DEF_LIGHT,   t_Bool},
+  {&do_wire,    "wire",    "Wire",    DEF_WIRE,    t_Bool},
+  {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool},
 };
 
 static OptionStruct desc[] =