http://slackware.bholcomb.com/slackware/slackware-11.0/source/xap/xscreensaver/xscree...

[xscreensaver] / hacks / glx / font-ximage.c

diff --git a/hacks/glx/font-ximage.c b/hacks/glx/font-ximage.c
index c0321e7ae4c4dffb8170cfc00fa85ad7022a8899..c8ddc4824088c3cd4f50b8dfcff489a6b45f1cdd 100644 (file)
--- a/hacks/glx/font-ximage.c
+++ b/hacks/glx/font-ximage.c
@@ -17,13 +17,19 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <GL/gl.h>     /* only for GLfloat */
+
+#ifdef HAVE_COCOA
+# include "jwxyz.h"
+# include <OpenGL/gl.h>
+#else  /* !HAVE_COCOA */
+# include <X11/Xlib.h>
+# include <X11/Xutil.h>
+# include <GL/gl.h>    /* only for GLfloat */
+#endif /* !HAVE_COCOA */
 
 extern char *progname;
 
-#include <X11/Xutil.h>
+#include "font-ximage.h"
 
 #undef MAX
 #define MAX(a,b) ((a)>(b)?(a):(b))
@@ -45,8 +51,9 @@ bigendian (void)
 static int
 to_pow2 (int i)
 {
-  static unsigned int pow2[] = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024,
-                                 2048, 4096, 8192, 16384, 32768, 65536 };
+  static const unsigned int pow2[] = { 
+    1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024,
+    2048, 4096, 8192, 16384, 32768, 65536 };
   int j;
   for (j = 0; j < countof(pow2); j++)
     if (pow2[j] >= i) return pow2[j];