From c9eacdaba1cb6fe1c3309181e0ec8a498b3dad3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Thu, 18 Jan 2024 03:37:24 -0500
Subject: [PATCH] I guess Win32 still doesn't have stdbool.h
---
src/xpdev/rwlockwrap.c | 2 --
src/xpdev/rwlockwrap.h | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/xpdev/rwlockwrap.c b/src/xpdev/rwlockwrap.c
index b0a9ef152d..cc90610d0f 100644
--- a/src/xpdev/rwlockwrap.c
+++ b/src/xpdev/rwlockwrap.c
@@ -2,8 +2,6 @@
#ifdef _WIN32
-#include "gen_defs.h" // For windows.h
-
bool
rwlock_init(rwlock_t *lock)
{
diff --git a/src/xpdev/rwlockwrap.h b/src/xpdev/rwlockwrap.h
index 79cea157cc..ceeb91eca3 100644
--- a/src/xpdev/rwlockwrap.h
+++ b/src/xpdev/rwlockwrap.h
@@ -1,11 +1,10 @@
#ifndef RWLOCKWRAP_H
#define RWLOCKWRAP_H
-#include <stdbool.h>
-
#if defined(__unix__)
#include <pthread.h>
+#include <stdbool.h>
typedef pthread_rwlock_t rwlock_t;
#define rwlock_init(lock) (pthread_rwlock_init(lock, NULL) == 0)
@@ -17,6 +16,7 @@ typedef pthread_rwlock_t rwlock_t;
#elif defined(_WIN32)
+#include "gen_defs.h" // For windows.h and bool :(
#include "threadwrap.h"
typedef struct {
--
GitLab