X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fxlockmore.h;h=5d2a1a1d5901a48466a2899fee9f87b0dcf9c142;hp=abb24818cc46c95135ef8d5baf799eca565107a1;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hpb=1d7308dd9032b39a92fda86e8c2db04218b45fbf

diff --git a/hacks/xlockmore.h b/hacks/xlockmore.h
index abb24818..5d2a1a1d 100644
--- a/hacks/xlockmore.h
+++ b/hacks/xlockmore.h
@@ -1,5 +1,5 @@
 /* xlockmore.h --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997-2008 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1997-2011 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
@@ -139,9 +139,11 @@ ERROR!  Sorry, xlockmore.h requires ANSI C (gcc, for example.)
 #  define xlockmore_validate_gl_visual 0
 # endif  /* !USE_GL || HAVE_COCOA */
 
-# ifndef USE_GL
-#  define xlockmore_gl_compute_fps 0
-# endif /* !USE_GL */
+# ifdef USE_GL
+#  define XLOCKMORE_FPS xlockmore_gl_compute_fps
+# else
+#  define XLOCKMORE_FPS xlockmore_do_fps
+# endif
 
 #ifdef WRITABLE_COLORS
 # undef WRITABLE_COLORS
@@ -197,7 +199,7 @@ ERROR!  Sorry, xlockmore.h requires ANSI C (gcc, for example.)
 	   xlockmore_setup,						\
 	   & NAME ## _xlockmore_function_table,				\
 	   0, 0, 0, 0, 0,						\
-           xlockmore_gl_compute_fps,					\
+           XLOCKMORE_FPS,						\
            xlockmore_pick_gl_visual,					\
 	   xlockmore_validate_gl_visual };				\
 									\