From b52e3f8db950cc8f3397fad00d0fcc8e611004f7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 13 Aug 2020 19:48:41 +0200
Subject: Remove workarounds for ancient versions of MSVC

---
 zix/common.h     | 4 ++--
 zix/sem.h        | 4 ++--
 zix/thread.h     | 4 ++--
 zix/tree_debug.h | 4 +---
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'zix')

diff --git a/zix/common.h b/zix/common.h
index e427885..3271858 100644
--- a/zix/common.h
+++ b/zix/common.h
@@ -17,6 +17,8 @@
 #ifndef ZIX_COMMON_H
 #define ZIX_COMMON_H
 
+#include <stdbool.h>
+
 /**
    @addtogroup zix
    @{
@@ -48,8 +50,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 #ifdef __GNUC__
diff --git a/zix/sem.h b/zix/sem.h
index 24bc446..faeb148 100644
--- a/zix/sem.h
+++ b/zix/sem.h
@@ -19,8 +19,6 @@
 
 #include "zix/common.h"
 
-#include <stdbool.h>
-
 #ifdef __APPLE__
 #    include <mach/mach.h>
 #elif defined(_WIN32)
@@ -35,6 +33,8 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
+
 /**
    @addtogroup zix
    @{
diff --git a/zix/thread.h b/zix/thread.h
index e2b59c4..b7956d2 100644
--- a/zix/thread.h
+++ b/zix/thread.h
@@ -19,8 +19,6 @@
 
 #include "zix/common.h"
 
-#include <stdbool.h>
-
 #ifdef _WIN32
 #    include <windows.h>
 #else
@@ -28,6 +26,8 @@
 #    include <pthread.h>
 #endif
 
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/zix/tree_debug.h b/zix/tree_debug.h
index e903265..ff9311e 100644
--- a/zix/tree_debug.h
+++ b/zix/tree_debug.h
@@ -17,9 +17,7 @@
 #ifndef ZIX_TREE_DEBUG_H
 #define ZIX_TREE_DEBUG_H
 
-#ifndef _MSC_VER
-#    include <inttypes.h>
-#endif
+#include <inttypes.h>
 
 #ifdef ZIX_TREE_DUMP
 static void
-- 
cgit v1.2.1