X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FfpsI.h;h=552de9c9f19a63d748a06b610739db3e8edd97ae;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=decd6849d9adad34c4e994f4349a0caa1e96e994;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;p=xscreensaver

diff --git a/hacks/fpsI.h b/hacks/fpsI.h
index decd6849..552de9c9 100644
--- a/hacks/fpsI.h
+++ b/hacks/fpsI.h
@@ -1,4 +1,4 @@
-/* fps, Copyright (c) 2001-2012 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,6 +14,8 @@
 # define __XSCREENSAVER_FPSI_H__
 
 #include "fps.h"
+#undef HAVE_GLBITMAP
+
 
 struct fps_state {
   Display *dpy;
@@ -24,11 +26,7 @@ struct fps_state {
   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;