X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Ffps.c;h=6e9f0e79157f8fc014b6dc612e4714bde2c3676f;hp=7813a8a62f6121ac16927b25a73be38c10713768;hb=488f2fa8fbdbc77e91a70da2962d73af49e6cace;hpb=c8c6deae79b408cffbc88043c766b3bc12cf0f13

diff --git a/hacks/glx/fps.c b/hacks/glx/fps.c
index 7813a8a6..6e9f0e79 100644
--- a/hacks/glx/fps.c
+++ b/hacks/glx/fps.c
@@ -1,4 +1,4 @@
-/* tube, Copyright (c) 2001, 2006 Jamie Zawinski <jwz@jwz.org>
+/* fps, Copyright (c) 2001-2007 Jamie Zawinski <jwz@jwz.org>
  * Utility function to draw a frames-per-second display.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -17,6 +17,7 @@
 #include "xlockmoreI.h"
 
 #ifdef HAVE_COCOA
+# undef usleep /* conflicts with 10.5 headers... */
 # include <OpenGL/gl.h>
 # include <OpenGL/glu.h>
 # include <AGL/agl.h>