X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fblocktube.c;h=a4c8e9bf52e2ad96f875a16b29cc802c39883f0f;hb=bc7b7a8eb122206d239ec0e693676bcce31be1aa;hp=9b4907eae54f357a61ade7f455c0a62c7e48febd;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver

diff --git a/hacks/glx/blocktube.c b/hacks/glx/blocktube.c
index 9b4907ea..a4c8e9bf 100644
--- a/hacks/glx/blocktube.c
+++ b/hacks/glx/blocktube.c
@@ -50,7 +50,7 @@ extern XtAppContext app;
 
 #include <GL/glu.h>
 
-#if defined( USE_XPM ) || defined( USE_XPMINC ) || defined( HAVE_XPM )
+#if defined(USE_XPM) || defined(USE_XPMINC) || defined(HAVE_XPM) || defined (HAVE_GDK_PIXBUF)
 /* USE_XPM & USE_XPMINC in xlock mode ; HAVE_XPM in xscreensaver mode */
 #include "xpm-ximage.h"
 #define I_HAVE_XPM
@@ -98,10 +98,10 @@ GLfloat tunnelWidth=5;
 static XrmOptionDescRec opts[] = {
     { "-holdtime",  ".holdtime",  XrmoptionSepArg, 0 },
     { "-changetime",  ".changetime",  XrmoptionSepArg, 0 },
-    {"-texture",     ".texture",   XrmoptionNoArg, (caddr_t) "True" },
-    {"+texture",     ".texture",   XrmoptionNoArg, (caddr_t) "False" },
-    {"-fog",         ".fog",       XrmoptionNoArg, (caddr_t) "True" },
-    {"+fog",         ".fog",       XrmoptionNoArg, (caddr_t) "False" },
+    {"-texture",     ".texture",   XrmoptionNoArg, "True" },
+    {"+texture",     ".texture",   XrmoptionNoArg, "False" },
+    {"-fog",         ".fog",       XrmoptionNoArg, "True" },
+    {"+fog",         ".fog",       XrmoptionNoArg, "False" },
 };
 
 static argtype vars[] = {