summaryrefslogtreecommitdiffstats
path: root/hacks/glx/tunnel_draw.c
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-06 14:23:46 +0200
committerSimon Rettberg2021-04-06 14:23:46 +0200
commit26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9 (patch)
treea51e1637554bcd84e63cccb1cb220c898a2c4ee8 /hacks/glx/tunnel_draw.c
parent5.44 (diff)
downloadxscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.gz
xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.tar.xz
xscreensaver-26b6e4255d4b9ff79a6dca10de5bec7bfc8691f9.zip
xscreensaver 6.00
Diffstat (limited to 'hacks/glx/tunnel_draw.c')
-rw-r--r--hacks/glx/tunnel_draw.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/hacks/glx/tunnel_draw.c b/hacks/glx/tunnel_draw.c
index 8a87c76..4e23339 100644
--- a/hacks/glx/tunnel_draw.c
+++ b/hacks/glx/tunnel_draw.c
@@ -34,9 +34,8 @@ static const char sccsid[] = "@(#)tunnel_draw.c 5.13 2004/05/25 xlockmore";
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "screenhackI.h"
+#include "tunnel_draw.h"
#ifdef USE_GL /* whole file */
@@ -44,24 +43,6 @@ static const char sccsid[] = "@(#)tunnel_draw.c 5.13 2004/05/25 xlockmore";
#include <stdlib.h>
#include <math.h>
-#ifdef STANDALONE
-# ifndef HAVE_JWXYZ
-# include <GL/gl.h>
-# include <GL/glu.h>
-# endif
-#endif
-#ifdef HAVE_ANDROID
-#include <GLES/gl.h>
-#endif
-
-
-#include "tunnel_draw.h"
-
-#ifdef STANDALONE /* For NRAND() */
-#include "xlockmoreI.h" /* in xscreensaver distribution */
-#else /* STANDALONE */
-#include "xlock.h" /* in xlockmore distribution */
-#endif /* STANDALONE */
typedef struct
{