X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fxft.c;h=92457527ee29e8e26198558e8d53b70af77afae6;hb=c85f503f5793839a6be4c818332aca4a96927bb2;hp=0b9b7ae5b6a2c52ada2c92094553db09255e4903;hpb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;p=xscreensaver

diff --git a/utils/xft.c b/utils/xft.c
index 0b9b7ae5..92457527 100644
--- a/utils/xft.c
+++ b/utils/xft.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2014-2015 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2014-2018 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -194,20 +194,16 @@ XftColorAllocValue (Display *dpy,
   if (!dpy || !visual || !color || !result) abort();
   if (visual->class == TrueColor)
     {
-      int red_shift, red_len;
-      int green_shift, green_len;
-      int blue_shift, blue_len;
-
-      red_shift   = maskbase (visual->red_mask);
-      red_len     = masklen  (visual->red_mask);
-      green_shift = maskbase (visual->green_mask);
-      green_len   = masklen (visual->green_mask);
-      blue_shift  = maskbase (visual->blue_mask);
-      blue_len    = masklen (visual->blue_mask);
+      int red_shift   = maskbase (visual->red_mask);
+      int red_len     = masklen  (visual->red_mask);
+      int green_shift = maskbase (visual->green_mask);
+      int green_len   = masklen (visual->green_mask);
+      int blue_shift  = maskbase (visual->blue_mask);
+      int blue_len    = masklen (visual->blue_mask);
       result->pixel = (((color->red   >> (16 - red_len))   << red_shift)   |
                        ((color->green >> (16 - green_len)) << green_shift) |
                        ((color->blue  >> (16 - blue_len))  << blue_shift));
-# ifdef HAVE_COCOA
+# ifdef HAVE_JWXYZ
       result->pixel |= BlackPixel(dpy, 0);  /* alpha */
 # endif
     }