From 4d8293901b89863f8d024cf2ed9138f4f6133196 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sat, 24 Sep 2022 10:37:06 +0300
Subject: utils: move some MSVC compat stuff to common place

Signed-off-by: Ran Benita <ran@unusedvar.com>
---
 src/context.c |  9 ---------
 src/utils.h   | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/context.c b/src/context.c
index 71c2275..5701a74 100644
--- a/src/context.c
+++ b/src/context.c
@@ -29,15 +29,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <io.h>
-# ifndef S_ISDIR
-#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-# endif
-#else
-# include <unistd.h>
-#endif
 
 #include "xkbcommon/xkbcommon.h"
 #include "utils.h"
diff --git a/src/utils.h b/src/utils.h
index 7557dab..c263635 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -31,13 +31,21 @@
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #else
 /* Required on Windows where unistd.h doesn't exist */
-#define R_OK    4               /* Test for read permission.  */
-#define W_OK    2               /* Test for write permission.  */
-#define X_OK    1               /* Test for execute permission.  */
-#define F_OK    0               /* Test for existence.  */
+# define R_OK    4               /* Test for read permission.  */
+# define W_OK    2               /* Test for write permission.  */
+# define X_OK    1               /* Test for execute permission.  */
+# define F_OK    0               /* Test for existence.  */
+#endif
+
+#ifdef _MSC_VER
+# include <direct.h>
+# include <io.h>
+# ifndef S_ISDIR
+#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# endif
 #endif
 
 #include "darray.h"
-- 
cgit v1.2.1