projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.x.org/contrib/applications/xscreensaver-3.23.tar.gz
[xscreensaver]
/
hacks
/
ripples.c
diff --git
a/hacks/ripples.c
b/hacks/ripples.c
index fd7e4fa79920f15eefc98f39b3afb7c2f6017090..eded66ee4d73c3f224dd9e1f9bbeb419d1c9f633 100644
(file)
--- a/
hacks/ripples.c
+++ b/
hacks/ripples.c
@@
-84,8
+84,11
@@
static void (*draw_transparent)(short *src);
/* How hard to hit the water */
#define SPLASH 512
/* How hard to hit the water */
#define SPLASH 512
+#undef MIN
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
+#undef MAX
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#undef DIRTY
#define DIRTY 3 /* dirty >= 2, 1 = restore original pixel, 0 = leave alone */
/* From fortune(6) */
#define DIRTY 3 /* dirty >= 2, 1 = restore original pixel, 0 = leave alone */
/* From fortune(6) */