summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRan Benita <ran@unusedvar.com>2023-04-11 23:24:47 +0300
committerRan Benita <ran@unusedvar.com>2023-04-11 23:29:25 +0300
commitbd79a960f596574e9c2ea59347f9afac469ef532 (patch)
tree77a5c458c1d2ce7d07a404a69f7575caad5196ed /tools
parent13d4b7f6417795b9ec634a766d0bf6afbf82c946 (diff)
downloadxorg-lib-libxkbcommon-bd79a960f596574e9c2ea59347f9afac469ef532.tar.gz
Possible fix for non-MSVC windows compilers
`_MSC_VER` is specific to MSVC, but there can be other compilers targeting windows. Hopefully they do define `_WIN32`, so let's use that. Refs: https://github.com/xkbcommon/libxkbcommon/issues/305 Signed-off-by: Ran Benita <ran@unusedvar.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/tools-common.c4
-rw-r--r--tools/tools-common.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/tools-common.c b/tools/tools-common.c
index 254499d..63fce4e 100644
--- a/tools/tools-common.c
+++ b/tools/tools-common.c
@@ -39,7 +39,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef _MSC_VER
+#ifdef _WIN32
#include <io.h>
#include <windows.h>
#else
@@ -160,7 +160,7 @@ tools_print_state_changes(enum xkb_state_component changed)
printf("]\n");
}
-#ifdef _MSC_VER
+#ifdef _WIN32
void
tools_disable_stdin_echo(void)
{
diff --git a/tools/tools-common.h b/tools/tools-common.h
index 780720a..0c16505 100644
--- a/tools/tools-common.h
+++ b/tools/tools-common.h
@@ -54,7 +54,7 @@ tools_enable_stdin_echo(void);
int
tools_exec_command(const char *prefix, int argc, char **argv);
-#ifdef _MSC_VER
+#ifdef _WIN32
#define setenv(varname, value, overwrite) _putenv_s((varname), (value))
#define unsetenv(varname) _putenv_s(varname, "")
#endif