From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz

[xscreensaver] / hacks / apple2-main.c

diff --git a/hacks/apple2-main.c b/hacks/apple2-main.c
index 46053eda1566fc948409d55daf08b8ec0a8e3858..3063b58d787f720324f9d700d7948586d0f420b0 100644 (file)
--- a/hacks/apple2-main.c
+++ b/hacks/apple2-main.c
@@ -87,7 +87,7 @@ scale_image (Display *dpy, Window window, XImage *in,
   int x, y, i;
   unsigned int rpos=0, gpos=0, bpos=0; /* bitfield positions */
   unsigned int rsiz=0, gsiz=0, bsiz=0;
-  unsigned int rmsk=0, gmsk=0, bmsk=0;
+  unsigned long rmsk=0, gmsk=0, bmsk=0;
   unsigned char spread_map[3][256];
   XWindowAttributes xgwa;
   XColor *colors = 0;
@@ -112,9 +112,7 @@ scale_image (Display *dpy, Window window, XImage *in,
     }
   else
     {
-      rmsk = xgwa.visual->red_mask;
-      gmsk = xgwa.visual->green_mask;
-      bmsk = xgwa.visual->blue_mask;
+      visual_rgb_masks (xgwa.screen, xgwa.visual, &rmsk, &gmsk, &bmsk);
       decode_mask (rmsk, &rpos, &rsiz);
       decode_mask (gmsk, &gpos, &gsiz);
       decode_mask (bmsk, &bpos, &bsiz);
@@ -1313,7 +1311,7 @@ a2_vt100_printc (apple2_sim_t *sim, struct terminal_controller_data *state,
             free (s);
             goto PRINT;
           } else {
-            c = 0;
+            /* c = 0; */
           }
         }
       }
@@ -1868,7 +1866,7 @@ apple2_draw (Display *dpy, Window window, void *closure)
     st->sim = 0;
   }
 
-#ifdef USE_IPHONE
+#ifdef HAVE_MOBILE
   return 0;
 #else
   return 5000;