MSVC: Use <io.h> as an alternative for <unistd.h>

Only the input/output functions from <unistd.h> options are used, so
using <io.h> when building with MSVC should be enough. The inclusion
of the header in context-priv.c does not seem to be needed (tested
on GNU/Linux) and so it is removed.

Signed-off-by: Ran Benita <ran@unusedvar.com>

diff --git a/src/context-priv.c b/src/context-priv.c
index dc85651eaeeb32183421fb1860ffa5efb8640383..3c1544035d386a0f543c67cd91d15b1aff8ead2d 100644 (file)
--- a/src/context-priv.c
+++ b/src/context-priv.c
@@ -29,7 +29,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <unistd.h>
 
 #include "xkbcommon/xkbcommon.h"
 #include "utils.h"

diff --git a/src/context.c b/src/context.c
index 9fac0abba1a24d5cd29e66a8271459b320b37cc1..fbb48dc8aa4dcd7029612321ba7d7be9b139fb45 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -29,7 +29,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <unistd.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/test/common.c b/test/common.c
index 3784d8b1ab76f991e36dc32b7ff78579519ec736..446ce58a0329b881d22fb16b98fe114f5f4805e0 100644 (file)
--- a/test/common.c
+++ b/test/common.c
@@ -34,7 +34,11 @@
 
 #include <limits.h>
 #include <fcntl.h>
+#ifdef _MSC_VER
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <termios.h>

diff --git a/test/context.c b/test/context.c
index 13d47a1a687ba00214c5b4ad1a762316f77055ce..2f5fd37dc955d76151c132884a06cd4d4cc5723e 100644 (file)
--- a/test/context.c
+++ b/test/context.c
@@ -30,7 +30,15 @@
 
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#ifdef _MSC_VER
+# include <io.h>
+# include <direct.h>
+# ifndef S_ISDIR
+#  define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# endif
+#else
+# include <unistd.h>
+#endif
 
 /* keeps a cache of all makedir/maketmpdir directories so we can free and
  * rmdir them in one go, see unmakedirs() */