X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgllist.h;h=1d6326a1769bae3f4aa306b79d76c1c5d2546ec5;hb=7edd66e6bd3209013ee059819747b10b5835635b;hp=077766f4567d1cdd970df46537fb6f892ca74854;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/glx/gllist.h b/hacks/glx/gllist.h
index 077766f4..1d6326a1 100644
--- a/hacks/glx/gllist.h
+++ b/hacks/glx/gllist.h
@@ -1,22 +1,44 @@
+/* xscreensaver, Copyright (c) 1998-2014 Jamie Zawinski <jwz@jwz.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ */
+
 #ifndef __GLLIST_H__
 #define __GLLIST_H__
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <stdlib.h>
 
 #ifdef HAVE_COCOA
-# include <OpenGL/gl.h>
-#else
+#elif defined(HAVE_ANDROID)
+# include <GLES/gl.h>
+#else /* real X11 */
 # include <GL/gl.h>
 #endif
 
-struct gllist{
-	GLenum format;
-	GLenum primitive;
-	int points;
-	const void *data;
-	struct gllist *next;
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
+struct gllist 
+{
+  GLenum format;
+  GLenum primitive;
+  int points;
+  const void *data;
+  struct gllist *next;
 };
 
-void renderList(const struct gllist *list, int wire_p);
+void renderList (const struct gllist *, int wire_p);
+void renderListNormals (const struct gllist *, GLfloat length, int facesp);
 
-#endif
+#endif /* __GLLIST_H__ */