From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/glx/mirrorblob.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'hacks/glx/mirrorblob.c')

diff --git a/hacks/glx/mirrorblob.c b/hacks/glx/mirrorblob.c
index 42981bd..4e754bb 100644
--- a/hacks/glx/mirrorblob.c
+++ b/hacks/glx/mirrorblob.c
@@ -73,21 +73,10 @@
 #define DEF_FADE_TIME        "5.0"
 #define DEF_ZOOM             "1.0"
 
-#ifdef HAVE_XMU
-# ifndef VMS
-#  include <X11/Xmu/Drawing.h>
-#else  /* VMS */
-#  include <Xmu/Drawing.h>
-# endif /* VMS */
-#endif
-
 #include "gltrackball.h"
 #include "grab-ximage.h"
 
-#undef countof
-#define countof(x) (sizeof((x)) / sizeof((*x)))
-
-#define PI  3.1415926535897
+#define PI M_PI
 
 /* Options from command line */
 static GLfloat blend;
@@ -169,7 +158,7 @@ static OptionStruct desc[] =
     {"-resolution", "Resolution of blob tesselation"},
     {"-bumps", "Number of bumps used to disturb blob"},
     {"-motion_blur", "Fade blob images (higher number = faster fade)"},
-    {"-fade_time", "Number of frames to transistion to next image"},
+    {"-fade_time", "Number of frames to transition to next image"},
     {"-hold_time", "Number of frames before next image"},
 };
 
-- 
cgit v1.2.3-55-g7522