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/dymaxionmap.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

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

diff --git a/hacks/glx/dymaxionmap.c b/hacks/glx/dymaxionmap.c
index 41de703..1527daa 100644
--- a/hacks/glx/dymaxionmap.c
+++ b/hacks/glx/dymaxionmap.c
@@ -14,7 +14,7 @@
  * other special, indirect and consequential damages.
  */
 
-#define LABEL_FONT "-*-helvetica-bold-r-normal-*-*-240-*-*-*-*-*-*"
+#define LABEL_FONT "sans-serif bold 24"
 
 #ifdef STANDALONE
 #define DEFAULTS    "*delay:		20000	\n" \
@@ -34,14 +34,6 @@
 #include "texfont.h"
 #include "dymaxionmap-coords.h"
 
-#ifdef HAVE_XMU
-# ifndef VMS
-#  include <X11/Xmu/Drawing.h>
-#else  /* VMS */
-#  include <Xmu/Drawing.h>
-# endif /* VMS */
-#endif
-
 #define DEF_ROTATE  "True"
 #define DEF_ROLL    "True"
 #define DEF_WANDER  "True"
@@ -53,9 +45,6 @@
 #define DEF_IMAGE2  "NONE"
 #define DEF_FRAMES  "720"
 
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
-
 #undef BELLRAND
 #define BELLRAND(n) ((frand((n)) + frand((n)) + frand((n))) / 3)
 #undef RANDSIGN
@@ -468,7 +457,8 @@ load_images (ModeInfo *mi)
 # ifdef HAVE_MOBILE
     unsigned long max = 320 * 1024 * 1024L;		/* 320 MB */
 # else
-    unsigned long max = 2 * 1024 * 1024 * 1024L;	/* 2 GB */
+  /*unsigned long max = 2 * 1024 * 1024 * 1024L;*/	/* 2 GB */
+    unsigned long max = 0x80000000L;			/* 2 GB */
 # endif
     gp->cache_p = (cache_size < max);
   }
-- 
cgit v1.2.3-55-g7522