From 262d4a1522c38be0588746e874159da5c7bb457d Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 9 Feb 2023 23:41:35 -0500
Subject: Improve system feature detection

---
 src/ring.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/ring.c')

diff --git a/src/ring.c b/src/ring.c
index 23199a0..ad00f75 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -9,10 +9,10 @@
 #include "zix/allocator.h"
 #include "zix/status.h"
 
-#if USE_MLOCK
-#  include <sys/mman.h>
-#elif defined(_WIN32)
+#if defined(_WIN32)
 #  include <windows.h>
+#elif USE_MLOCK
+#  include <sys/mman.h>
 #endif
 
 /*
@@ -108,16 +108,16 @@ zix_ring_free(ZixRing* const ring)
 ZixStatus
 zix_ring_mlock(ZixRing* const ring)
 {
-#if USE_MLOCK
-  return zix_errno_status_if(mlock(ring, sizeof(ZixRing)) +
-                             mlock(ring->buf, ring->size));
-
-#elif defined(_WIN32)
+#if defined(_WIN32)
   return (VirtualLock(ring, sizeof(ZixRing)) &&
           VirtualLock(ring->buf, ring->size))
            ? ZIX_STATUS_SUCCESS
            : ZIX_STATUS_ERROR;
 
+#elif USE_MLOCK
+  return zix_errno_status_if(mlock(ring, sizeof(ZixRing)) +
+                             mlock(ring->buf, ring->size));
+
 #else
   return ZIX_STATUS_NOT_SUPPORTED;
 #endif
-- 
cgit v1.2.1