pixman: Branch 'master'

[Søren Sandmann Pedersen]

 configure.ac            |   11 +++++++++++
 pixman/pixman-private.h |    4 ++--
 pixman/pixman-timer.c   |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 3c570a815afb282df01f41acad385ff0e3e33899
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Thu Jun 4 00:05:06 2009 -0400

    Add an --enable-timers configure option to enable the TIMER_BEGIN/END macros

diff --git a/configure.ac b/configure.ac
index 74ae807..5409e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,6 +436,17 @@ fi
 
 AM_CONDITIONAL(USE_GCC_INLINE_ASM, test $have_gcc_inline_asm = yes)
 
+dnl ==============================================
+dnl Timers
+
+AC_ARG_ENABLE(timers,
+   [AC_HELP_STRING([--enable-timers],
+		   [enable TIMER_BEGIN and TIMER_END macros [default=no]])],
+   [enable_timers=$enableval], [enable_timers=no])
+
+AC_DEFINE(PIXMAN_TIMERS, 1, [enable TIMER_BEGIN/TIMER_END macros])
+AC_SUBST(PIXMAN_TIMERS)
+
 dnl ===================================
 dnl GTK+
 
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index d95de2c..94e23c6 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -778,7 +778,7 @@ void pixman_region_internal_set_static_pointers (pixman_box16_t *empty_box,
 						 pixman_region16_data_t *empty_data,
 						 pixman_region16_data_t *broken_data);
 
-#ifdef PIXMAN_TIMING
+#ifdef PIXMAN_TIMERS
 
 /* Timing */
 static inline uint64_t
@@ -823,7 +823,7 @@ void pixman_timer_register (PixmanTimer *timer);
         timer##tname.total += OIL_STAMP() - begin##tname;		\
     }
 
-#endif /* PIXMAN_TIMING */
+#endif /* PIXMAN_TIMERS */
 
 typedef struct pixman_implementation_t pixman_implementation_t;
 
diff --git a/pixman/pixman-timer.c b/pixman/pixman-timer.c
index ce54e74..7742527 100644
--- a/pixman/pixman-timer.c
+++ b/pixman/pixman-timer.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include "pixman-private.h"
 
-#ifdef PIXMAN_TIMER
+#ifdef PIXMAN_TIMERS
 
 static PixmanTimer *timers;