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/gltrackball.c | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

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

diff --git a/hacks/glx/gltrackball.c b/hacks/glx/gltrackball.c
index 9e3314c..7a46f06 100644
--- a/hacks/glx/gltrackball.c
+++ b/hacks/glx/gltrackball.c
@@ -10,29 +10,12 @@
  * implied warranty.
  */
 
+#include "screenhackI.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_COCOA
-# include "jwxyz.h"
-#elif defined(HAVE_ANDROID)
-# include "jwxyz.h"
-# include <GLES/gl.h>
-#else  /* real X11 */
-# include <X11/X.h>
-# include <X11/Xlib.h>
-# include <GL/gl.h>
-#endif /* !HAVE_COCOA */
-
-#ifdef HAVE_JWZGLES
-# include "jwzgles.h"
-#endif /* HAVE_JWZGLES */
-
 # define Button4 4  /* WTF */
 # define Button5 5
 # define Button6 6
@@ -41,7 +24,7 @@
 #include "trackball.h"
 #include "gltrackball.h"
 
-#if defined(USE_IPHONE) || defined(HAVE_ANDROID)
+#if defined(HAVE_IPHONE) || defined(HAVE_ANDROID)
   /* Surely this should be defined somewhere more centrally... */
 # define HAVE_MOBILE
 #endif
@@ -216,7 +199,7 @@ gltrackball_reset (trackball_state *ts, float x, float y)
 
 
 /* Execute the rotations current encapsulated in the trackball_state:
-   this does something analagous to glRotatef().
+   this does something analogous to glRotatef().
  */
 void
 gltrackball_rotate (trackball_state *ts)
-- 
cgit v1.2.3-55-g7522