summaryrefslogtreecommitdiffstats
path: root/hacks/glx/tunnel_draw.c
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-06 14:43:39 +0200
committerSimon Rettberg2021-04-07 13:38:37 +0200
commit38886de0c3e9ea5729ef23e4c653fa2822f52e8f (patch)
tree9b799c8c968a92cc77746a95e0e8bdd90b6b13c3 /hacks/glx/tunnel_draw.c
parentMaybe not remove, but ... (diff)
downloadxscreensaver-openslx.tar.gz
xscreensaver-openslx.tar.xz
xscreensaver-openslx.zip
xscreensaver 6.00v28r1openslx
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
{