X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgllist.h;h=1d6326a1769bae3f4aa306b79d76c1c5d2546ec5;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=d04ae9a30c375cd8e2a8549d6d15ef061e2f6672;hpb=4cecfc89e5e889c7232693897c06168fb378bd5c;p=xscreensaver

diff --git a/hacks/glx/gllist.h b/hacks/glx/gllist.h
index d04ae9a3..1d6326a1 100644
--- a/hacks/glx/gllist.h
+++ b/hacks/glx/gllist.h
@@ -1,16 +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__
-#include <GL/gl.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <stdlib.h>
 
-struct gllist{
-	GLenum format;
-	GLenum primitive;
-	int points;
-	void *data;
-	struct gllist *next;
+#ifdef HAVE_COCOA
+#elif defined(HAVE_ANDROID)
+# include <GLES/gl.h>
+#else /* real X11 */
+# include <GL/gl.h>
+#endif
+
+#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(struct gllist *list);
+void renderList (const struct gllist *, int wire_p);
+void renderListNormals (const struct gllist *, GLfloat length, int facesp);
 
-#endif
+#endif /* __GLLIST_H__ */