diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-05-26 20:28:23 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-05-27 05:11:00 -0400 |
| commit | 626edfc333b77604b6955c12ae111d14c174034c (patch) | |
| tree | 33e029338be82c7bad56261acfda3870e85986b7 /src/cairo-mutex.c | |
| parent | 07fef4f4802639a2cb16284841635d1bcc9b8e8f (diff) | |
[cairo-mutex] Prepare mutex infrastructure for adding mutex debugging facilities
Essentially renaming cairo-mutex-type-private.h to cairo-mutex-impl-private.h
and changing all its namespace from cairo_mutex to cairo_mutex_impl.
cairo-mutex-type-private.h then does all the sanity checks on the
implementation that used to be in cairo-mutex-private.h. Plus, defines macros
for the cairo-mutex namespace to map to the cairo-mutex-impl namespace. This
extra mapping layer allows for add debugging facilities.
Diffstat (limited to 'src/cairo-mutex.c')
| -rw-r--r-- | src/cairo-mutex.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/cairo-mutex.c b/src/cairo-mutex.c index 88aaf0d02..5149ee831 100644 --- a/src/cairo-mutex.c +++ b/src/cairo-mutex.c @@ -33,25 +33,27 @@ #include "cairoint.h" +#include "cairo-mutex-private.h" + #define CAIRO_MUTEX_DECLARE(mutex) cairo_mutex_t mutex = CAIRO_MUTEX_NIL_INITIALIZER #include "cairo-mutex-list-private.h" #undef CAIRO_MUTEX_DECLARE -#if _CAIRO_MUTEX_USE_STATIC_INITIALIZER || _CAIRO_MUTEX_USE_STATIC_FINALIZER +#if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER || _CAIRO_MUTEX_IMPL_USE_STATIC_FINALIZER -# if _CAIRO_MUTEX_USE_STATIC_INITIALIZER -# define _CAIRO_MUTEX_INITIALIZED_DEFAULT_VALUE FALSE +# if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER +# define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE FALSE # else -# define _CAIRO_MUTEX_INITIALIZED_DEFAULT_VALUE TRUE +# define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE TRUE # endif -cairo_bool_t _cairo_mutex_initialized = _CAIRO_MUTEX_INITIALIZED_DEFAULT_VALUE; +cairo_bool_t _cairo_mutex_initialized = _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE; -# undef _CAIRO_MUTEX_INITIALIZED_DEFAULT_VALUE +# undef _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE #endif -#if _CAIRO_MUTEX_USE_STATIC_INITIALIZER +#if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER void _cairo_mutex_initialize (void) { if (_cairo_mutex_initialized) @@ -65,7 +67,7 @@ void _cairo_mutex_initialize (void) } #endif -#if _CAIRO_MUTEX_USE_STATIC_FINALIZER +#if _CAIRO_MUTEX_IMPL_USE_STATIC_FINALIZER void _cairo_mutex_finalize (void) { if (!_cairo_mutex_initialized) |