X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=97e7824ffcf7c78def6550eb3550174789847d25;hb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;hp=dcdb0f5e4363e2711a4c53d4f42c4820c3cba485;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c index dcdb0f5e..97e7824f 100644 --- a/hacks/glx/moebius.c +++ b/hacks/glx/moebius.c @@ -1,9 +1,8 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* moebius --- Moebius Strip II, an Escher-like GL scene with ants. */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)moebius.c 5.01 2001/03/01 xlockmore"; - #endif /*- @@ -123,8 +122,8 @@ static XrmOptionDescRec opts[] = }; static argtype vars[] = { - {(caddr_t *) & solidmoebius, (char *) "solidmoebius", (char *) "Solidmoebius", (char *) DEF_SOLIDMOEBIUS, t_Bool}, - {(caddr_t *) & noants, (char *) "noants", (char *) "Noants", (char *) DEF_NOANTS, t_Bool} + {&solidmoebius, "solidmoebius", "Solidmoebius", DEF_SOLIDMOEBIUS, t_Bool}, + {&noants, "noants", "Noants", DEF_NOANTS, t_Bool} }; static OptionStruct desc[] = @@ -608,7 +607,7 @@ pinit(void) GL_RGB, GL_UNSIGNED_BYTE, WoodTextureData); if (status) { - const char *s = gluErrorString (status); + const char *s = (char *) gluErrorString (status); fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n", progname, WoodTextureWidth, WoodTextureHeight, (s ? s : "(unknown)"));