[cairo-commit] 2 commits - src/cairo-mutex-impl-private.h

[GitLab Mirror]

 src/cairo-mutex-impl-private.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c68ff21e40caf0426719e4f3a8ac8e95e9731ee1
Merge: f408ae926 b29f46733
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Wed Jun 29 22:38:49 2022 +0000

    Merge branch 'mutex-fix' into 'master'
    
    [mutex] Fix build with no mutexes
    
    See merge request cairo/cairo!338

commit b29f467330346e910208dac96f39e1c8d4a62cc3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jun 29 11:16:04 2022 -0600

    [mutex] Fix build with no mutexes
    
    NOOP1 is a statement, not an expression.

diff --git a/src/cairo-mutex-impl-private.h b/src/cairo-mutex-impl-private.h
index a8599d47e..de0c9b21b 100644
--- a/src/cairo-mutex-impl-private.h
+++ b/src/cairo-mutex-impl-private.h
@@ -166,7 +166,7 @@
 # define CAIRO_MUTEX_IMPL_NO 1
 # define CAIRO_MUTEX_IMPL_INITIALIZE() CAIRO_MUTEX_IMPL_NOOP
 # define CAIRO_MUTEX_IMPL_LOCK(mutex) CAIRO_MUTEX_IMPL_NOOP1(mutex)
-# define CAIRO_MUTEX_IMPL_TRY_LOCK(mutex) (CAIRO_MUTEX_IMPL_NOOP1(mutex), TRUE)
+# define CAIRO_MUTEX_IMPL_TRY_LOCK(mutex) ((mutex), TRUE)
 # define CAIRO_MUTEX_IMPL_UNLOCK(mutex) CAIRO_MUTEX_IMPL_NOOP1(mutex)
 # define CAIRO_MUTEX_IMPL_NIL_INITIALIZER 0