X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fbinaryring.c;h=3cbaec27ffac7959ccbe0d27a9c6999a78122b90;hp=f337537d75894e3d0248b3203cddf12ef1913793;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hpb=88cfe534a698a0562e81345957a50714af1453bc

diff --git a/hacks/binaryring.c b/hacks/binaryring.c
index f337537d..3cbaec27 100644
--- a/hacks/binaryring.c
+++ b/hacks/binaryring.c
@@ -27,12 +27,6 @@
 #include "colors.h"
 #include "hsv.h"
 
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-typedef unsigned long uint32_t;
-#endif
-
 #define ANTIALIAS   1
 #define BLACK       0
 #define WHITE       1
@@ -43,7 +37,7 @@ typedef unsigned long uint32_t;
 #define max(a,b) ((a)>(b)?(a):(b))
 
 /* better if signed */
-typedef uint32_t pixel_t;
+typedef unsigned long pixel_t;
 
 
 typedef struct {
@@ -90,7 +84,7 @@ static void point2rgb(int depth, pixel_t c, int *r, int *g, int *b)
     switch(depth) {
     case 32:
     case 24:
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
         /* This program idiotically does not go through a color map, so
                we have to hardcode in knowledge of how jwxyz.a packs pixels!
                Fix it to go through st->colors[st->ncolors] instead!
@@ -124,7 +118,7 @@ static pixel_t rgb2point(int depth, int r, int g, int b)
     switch(depth) {
     case 32:
     case 24:
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
         /* This program idiotically does not go through a color map, so
                we have to hardcode in knowledge of how jwxyz.a packs pixels!
                Fix it to go through st->colors[st->ncolors] instead!
@@ -184,7 +178,7 @@ void draw_point ( struct state* st,
 
 
 void print_color ( struct state* st, pixel_t color ) {
-    int r, g, b;
+    int r=0, g=0, b=0;
     point2rgb(st->depth, color, &r, &g, &b);
     printf( "%d %d %d\n", r, g, b);
 }
@@ -389,7 +383,7 @@ static void clamp ( int* value, int l, int h ) {
 }
 
 static pixel_t next_color ( struct state* st, pixel_t current ) {
-    int r, g, b;
+    int r=0, g=0, b=0;
 
     point2rgb(st->depth, current, &r, &g, &b);
     r += random() % 5 - 2;