diff options
| author | Ran Benita <ran@unusedvar.com> | 2022-09-24 10:37:06 +0300 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2022-09-24 12:31:53 +0300 |
| commit | 4d8293901b89863f8d024cf2ed9138f4f6133196 (patch) | |
| tree | 6bd36aacf65f9e853103bd37f1f93d2637c757f6 | |
| parent | b309514247996d55f6ef33e530a722e2431c2fdb (diff) | |
| download | xorg-lib-libxkbcommon-4d8293901b89863f8d024cf2ed9138f4f6133196.tar.gz | |
utils: move some MSVC compat stuff to common place
Signed-off-by: Ran Benita <ran@unusedvar.com>
| -rw-r--r-- | src/context.c | 9 | ||||
| -rw-r--r-- | src/utils.h | 18 | ||||
| -rw-r--r-- | test/context.c | 9 |
3 files changed, 13 insertions, 23 deletions
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" diff --git a/test/context.c b/test/context.c index f91be54..9f6cad7 100644 --- a/test/context.c +++ b/test/context.c @@ -30,15 +30,6 @@ #include <sys/stat.h> #include <sys/types.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() */ |