2 commits - src/cairo-atomic-private.h

[GitLab Mirror]

 src/cairo-atomic-private.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 217501df9c1d2aaaaad1d4ab01941e9364e34b28
Merge: 0bf026500 76a0978d7
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Wed Jul 2 16:13:29 2025 +0000

    Merge branch 'fix-init-once-complete-check' into 'master'
    
    Fix check for InitOnceComplete failure
    
    See merge request cairo/cairo!631

commit 76a0978d7b050cd00036a12a7bc1f717b4bc32dd
Author: Luca Bacci <luca.bacci982 at gmail.com>
Date:   Wed Jul 2 12:02:06 2025 +0200

    Fix check for InitOnceComplete failure
    
    ...also include <windows.h>
    
    Fixes ff4f2f43

diff --git a/src/cairo-atomic-private.h b/src/cairo-atomic-private.h
index d22d79e89..d8d805771 100644
--- a/src/cairo-atomic-private.h
+++ b/src/cairo-atomic-private.h
@@ -486,6 +486,8 @@ _cairo_atomic_ptr_cmpxchg_return_old_fallback(cairo_atomic_intptr_t *x, void *ol
 
 #if defined (_WIN32)
 
+#include <windows.h>
+
 typedef INIT_ONCE cairo_atomic_once_t;
 #define CAIRO_ATOMIC_ONCE_INIT INIT_ONCE_STATIC_INIT
 
@@ -507,7 +509,7 @@ _cairo_atomic_init_once_enter(cairo_atomic_once_t *once)
 static cairo_always_inline void
 _cairo_atomic_init_once_leave(cairo_atomic_once_t *once)
 {
-    if (unlikely (InitOnceComplete (once, 0, NULL))) {
+    if (unlikely (!InitOnceComplete (once, 0, NULL))) {
         assert (0 && "InitOnceComplete failed");
     }
 }