diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-09-19 16:52:59 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-09-19 16:57:42 -0400 |
| commit | eb89bf049a4c2ab0946c45a1277bfd8b1519efa1 (patch) | |
| tree | 1888b8c06c271da8643725dc9a369da589c654d9 /src/cairo-mutex-impl-private.h | |
| parent | 33b6d2b5eb4f5d424cec51970d9b72bef49a5fc8 (diff) | |
| download | cairo-eb89bf049a4c2ab0946c45a1277bfd8b1519efa1.tar.gz | |
Check for _MSC_VER in mutex implementation code
Previously I made the mutex implementation code to use Windows mutexes
conditional on HAVE_WINDOWS_H. This was suppposed to be a more wine-friendly
version of checking for a Windows platform. However, it also meant that
when compiling without config.h, one had to stuff a #define for HAVE_WINDOWS_H
somewhere. Traditionally it was put in cairo-features-win32.h, and that
practice was carried over even after my build system rewrite.
Somewhere along the road I also decided that the mutex implementation header
does not need to include anything other than config.h. So the hacked up
HAVE_WINDOWS_H in cairo-features-win32.h was not being seen by its lone
user.
We now condition on any of HAVE_WINDOWS_H and _MSC_VER. So the hack can be
removed altogether.
Diffstat (limited to 'src/cairo-mutex-impl-private.h')
| -rw-r--r-- | src/cairo-mutex-impl-private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cairo-mutex-impl-private.h b/src/cairo-mutex-impl-private.h index db65bd188..b8f32a447 100644 --- a/src/cairo-mutex-impl-private.h +++ b/src/cairo-mutex-impl-private.h @@ -174,7 +174,7 @@ # define CAIRO_MUTEX_IMPL_FINALIZE() CAIRO_MUTEX_IMPL_NOOP # define CAIRO_MUTEX_IMPL_NIL_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#elif HAVE_WINDOWS_H /*******************************************************/ +#elif defined(HAVE_WINDOWS_H) || defined(_MSC_VER) /*************************/ # include <windows.h> |