From http://www.jwz.org/xscreensaver/xscreensaver-5.30.tar.gz

[xscreensaver] / hacks / fpsI.h

diff --git a/hacks/fpsI.h b/hacks/fpsI.h
index e656362b0abc4ee3341324c4ff4e61787d2a913a..0a197da12d2cdfbdd55ba5e3b030e0ea3288172c 100644 (file)
--- a/hacks/fpsI.h
+++ b/hacks/fpsI.h
@@ -1,4 +1,4 @@
-/* fps, Copyright (c) 2001-2008 Jamie Zawinski <jwz@jwz.org>
+/* fps, Copyright (c) 2001-2014 Jamie Zawinski <jwz@jwz.org>
  * Draw a frames-per-second display (Xlib and OpenGL).
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -14,16 +14,24 @@
 # define __XSCREENSAVER_FPSI_H__
 
 #include "fps.h"
+#undef HAVE_GLBITMAP
+
 
 struct fps_state {
   Display *dpy;
   Window window;
   int x, y;
   XFontStruct *font;
-  unsigned long font_dlist;  /* for glx/fps-gl.c */
   Bool clear_p;
   char string[1024];
 
+  /* for glx/fps-gl.c */
+# ifdef HAVE_GLBITMAP
+  unsigned long font_dlist;
+# else
+  void *gl_fps_data;
+# endif
+
   GC draw_gc, erase_gc;
 
   int last_ifps;