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.19.tar.gz
[xscreensaver]
/
hacks
/
t3d.c
diff --git
a/hacks/t3d.c
b/hacks/t3d.c
index b569c7511fc04dcfa7172d81506e5c728df09da3..698aad34707c87a760aea41635a09e65e8c88c9a 100644
(file)
--- a/
hacks/t3d.c
+++ b/
hacks/t3d.c
@@
-59,7
+59,8
@@
int timewait=40000;
#define frac(argument) argument-floor(argument)
#define frac(argument) argument-floor(argument)
-#define abs(x) ((x)<0.0 ? -(x) : (x))
+#undef ABS
+#define ABS(x) ((x)<0.0 ? -(x) : (x))
static Colormap cmap;
/* static XColor gray1; */
static Colormap cmap;
/* static XColor gray1; */
@@
-512,7
+513,7
@@
fill_kugel(int i, Pixmap buf, int setcol)
{
double ra;
int m,col,inc=1,inr=3,d;
{
double ra;
int m,col,inc=1,inr=3,d;
- d=(int)((
abs
(kugeln[i].r1)*2));
+ d=(int)((
ABS
(kugeln[i].r1)*2));
if (d==0) d=1;
#ifdef FASTDRAW
if (d==0) d=1;
#ifdef FASTDRAW
@@
-533,7
+534,7
@@
fill_kugel(int i, Pixmap buf, int setcol)
else
#endif
{
else
#endif
{
- if(
abs
(kugeln[i].r1)<6.0) inr=9;
+ if(
ABS
(kugeln[i].r1)<6.0) inr=9;
for (m=0;m<=28;m+=inr)
{
for (m=0;m<=28;m+=inr)
{