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

[xscreensaver] / hacks / glx / extrusion.c

diff --git a/hacks/glx/extrusion.c b/hacks/glx/extrusion.c
index 683486518f98155b1654cfe669557d461d5fdb87..32f8e6946d39e0c43921994986b54108ee7d2f6f 100644 (file)
--- a/hacks/glx/extrusion.c
+++ b/hacks/glx/extrusion.c
@@ -22,13 +22,6 @@
  * which can be obtained from http://www.linas.org/gle/index.html
   */
 
-/*-
- * 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 HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -124,30 +117,30 @@ static char *which_name;
 static char *which_image;
 
 static XrmOptionDescRec opts[] = {
-  {"-light",   ".extrusion.light",     XrmoptionNoArg, (caddr_t) "true" },
-  {"+light",   ".extrusion.light",     XrmoptionNoArg, (caddr_t) "false" },
-  {"-wire",    ".extrusion.wire",      XrmoptionNoArg, (caddr_t) "true" },
-  {"+wire",    ".extrusion.wire",      XrmoptionNoArg, (caddr_t) "false" },
-  {"-texture", ".extrusion.texture",   XrmoptionNoArg, (caddr_t) "true" },
-  {"+texture", ".extrusion.texture",   XrmoptionNoArg, (caddr_t) "false" },
-  {"-texture", ".extrusion.texture",   XrmoptionNoArg, (caddr_t) "true" },
-  {"+texture_quality", ".extrusion.texture",   XrmoptionNoArg, (caddr_t) "false" },
-  {"-texture_quality", ".extrusion.texture",   XrmoptionNoArg, (caddr_t) "true" },
-  {"+mipmap", ".extrusion.mipmap",   XrmoptionNoArg, (caddr_t) "false" },
-  {"-mipmap", ".extrusion.mipmap",   XrmoptionNoArg, (caddr_t) "true" },
-  {"-name",   ".extrusion.name",  XrmoptionSepArg, (caddr_t) NULL },
-  {"-image",   ".extrusion.image",  XrmoptionSepArg, (caddr_t) NULL },
+  {"-light",   ".extrusion.light",     XrmoptionNoArg, "true" },
+  {"+light",   ".extrusion.light",     XrmoptionNoArg, "false" },
+  {"-wire",    ".extrusion.wire",      XrmoptionNoArg, "true" },
+  {"+wire",    ".extrusion.wire",      XrmoptionNoArg, "false" },
+  {"-texture", ".extrusion.texture",   XrmoptionNoArg, "true" },
+  {"+texture", ".extrusion.texture",   XrmoptionNoArg, "false" },
+  {"-texture", ".extrusion.texture",   XrmoptionNoArg, "true" },
+  {"+texture_quality", ".extrusion.texture",   XrmoptionNoArg, "false" },
+  {"-texture_quality", ".extrusion.texture",   XrmoptionNoArg, "true" },
+  {"+mipmap", ".extrusion.mipmap",   XrmoptionNoArg, "false" },
+  {"-mipmap", ".extrusion.mipmap",   XrmoptionNoArg, "true" },
+  {"-name",   ".extrusion.name",  XrmoptionSepArg, 0 },
+  {"-image",   ".extrusion.image",  XrmoptionSepArg, 0 },
 };
 
 
 static argtype vars[] = {
-  {(caddr_t *) &do_light,    "light",   "Light",   DEF_LIGHT,   t_Bool},
-  {(caddr_t *) &do_wire,    "wire",   "Wire",   DEF_WIRE,   t_Bool},
-  {(caddr_t *) &do_texture,    "texture",   "Texture",   DEF_TEXTURE,   t_Bool},
-  {(caddr_t *) &do_texture_quality,    "texture_quality",   "Texture_Quality",   DEF_TEXTURE_QUALITY,   t_Bool},
-  {(caddr_t *) &do_mipmap,    "mipmap",   "Mipmap",   DEF_MIPMAP,   t_Bool},
-  {(caddr_t *) &which_name, "name",   "Name",   DEF_NAME,   t_String},
-  {(caddr_t *) &which_image, "image",   "Image",   DEF_IMAGE,   t_String},
+  {&do_light,    "light",   "Light",   DEF_LIGHT,   t_Bool},
+  {&do_wire,    "wire",   "Wire",   DEF_WIRE,   t_Bool},
+  {&do_texture,    "texture",   "Texture",   DEF_TEXTURE,   t_Bool},
+  {&do_texture_quality,    "texture_quality",   "Texture_Quality",   DEF_TEXTURE_QUALITY,   t_Bool},
+  {&do_mipmap,    "mipmap",   "Mipmap",   DEF_MIPMAP,   t_Bool},
+  {&which_name, "name",   "Name",   DEF_NAME,   t_String},
+  {&which_image, "image",   "Image",   DEF_IMAGE,   t_String},
 };
 
 
@@ -273,7 +266,7 @@ void Create_Texture(ModeInfo *mi, const char *filename)
     {
       XImage *ximage = xpm_file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi),
                                            MI_COLORMAP (mi), filename);
-      image  = ximage->data;
+      image  = (GLubyte *) ximage->data;
       width  = ximage->width;
       height = ximage->height;
       format = GL_RGBA;
@@ -308,7 +301,7 @@ void Create_Texture(ModeInfo *mi, const char *filename)
                                  GL_UNSIGNED_BYTE, image);
       if (status)
         {
-          const char *s = gluErrorString (status);
+          const char *s = (char *) gluErrorString (status);
           fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n",
                    progname, width, height,
                    (s ? s : "(unknown)"));
@@ -455,7 +448,7 @@ initializeGL(ModeInfo *mi, GLsizei width, GLsizei height)
   glClearColor(0,0,0,0);
 /*    glCullFace(GL_BACK); */
 /*    glEnable(GL_CULL_FACE); */
-  glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, TRUE);
+  glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, True);
   glShadeModel(GL_SMOOTH);
 
   if (do_light)