diff options
| author | Adrian Perez de Castro <aperez@igalia.com> | 2019-08-05 13:52:18 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2019-12-28 16:12:15 +0200 |
| commit | 5354dee2f7ee99792a38a3a13f85da90c654f7ee (patch) | |
| tree | d815208aba67ffc6bf4d9e0fe64c6e13396a639a | |
| parent | f09ae987bffc2ede00341bc6f0e903ae6810def5 (diff) | |
| download | libxkbcommon-5354dee2f7ee99792a38a3a13f85da90c654f7ee.tar.gz libxkbcommon-5354dee2f7ee99792a38a3a13f85da90c654f7ee.tar.bz2 libxkbcommon-5354dee2f7ee99792a38a3a13f85da90c654f7ee.zip | |
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>
| -rw-r--r-- | src/context-priv.c | 1 | ||||
| -rw-r--r-- | src/context.c | 10 | ||||
| -rw-r--r-- | test/common.c | 4 | ||||
| -rw-r--r-- | test/context.c | 10 |
4 files changed, 22 insertions, 3 deletions
diff --git a/src/context-priv.c b/src/context-priv.c index dc85651..3c15440 100644 --- 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 9fac0ab..fbb48dc 100644 --- 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 3784d8b..446ce58 100644 --- 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 13d47a1..2f5fd37 100644 --- 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() */ |