X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ft3d.c;h=8b7ee7ed6f64b3cfad0a012f5fc552eeb2bad99a;hb=3f438031d610c7e15fd33876a879b97e290e05fb;hp=b569c7511fc04dcfa7172d81506e5c728df09da3;hpb=551b3de3f619c04c2dd1971ee9b3f02e270c28c9;p=xscreensaver

diff --git a/hacks/t3d.c b/hacks/t3d.c
index b569c751..8b7ee7ed 100644
--- a/hacks/t3d.c
+++ b/hacks/t3d.c
@@ -59,7 +59,8 @@ int timewait=40000;
 
 #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; */
@@ -512,7 +513,7 @@ fill_kugel(int i, Pixmap buf, int setcol)
 {
   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
@@ -533,7 +534,7 @@ fill_kugel(int i, Pixmap buf, int setcol)
   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)
 	{
@@ -800,7 +801,8 @@ XrmOptionDescRec options [] = {
   { "-wobble",		".wobble",	XrmoptionSepArg, 0 },
   { "-cycle",		".cycle",	XrmoptionSepArg, 0 },
   { "-mag",		".mag",		XrmoptionSepArg, 0 },
-  { "-minutes",		".minutes",	XrmoptionSepArg, 0 },
+  { "-minutes",		".minutes",	XrmoptionNoArg, "True" },
+  { "-no-minutes",	".minutes",	XrmoptionNoArg, "False" },
   { "-delay",		".delay",	XrmoptionSepArg, 0 },
   { "-fast",		".fast",	XrmoptionSepArg, 0 },
   { "-colcycle",	".colcycle",	XrmoptionSepArg, 0 },