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/cube21.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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

diff --git a/hacks/glx/cube21.c b/hacks/glx/cube21.c
index de72206..7a1abcb 100644
--- a/hacks/glx/cube21.c
+++ b/hacks/glx/cube21.c
@@ -81,9 +81,6 @@
 #define BORDER     3
 #define BORDER2    9
 
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
-
 #define rnd01() (random()%2)
 #define rndcolor() (frand(0.5)+0.3)
 
@@ -515,14 +512,12 @@ static Bool draw_main(ModeInfo *mi, cube21_conf *cp)
     glTranslatef(0, 0, zpos);
   glScalef(size, size, size);
 
-# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
   {
-    GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
-    int o = (int) current_device_rotation();
-    if (o != 0 && o != 180 && o != -180)
-      glScalef (1/h, 1/h, 1/h);
+    GLfloat s = (MI_WIDTH(mi) < MI_HEIGHT(mi)
+                 ? (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi))
+                 : 1);
+    glScalef (s, s, s);
   }
-# endif
 
   glRotatef(cp->xrot, 1.0, 0.0, 0.0);
   glRotatef(cp->yrot, 0.0, 1.0, 0.0);
-- 
cgit v1.2.3-55-g7522