StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
master
Ran Benita 2023-04-11 23:24:47 +03:00
parent 13d4b7f641
commit bd79a960f5
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/bench.c
View File

@ -30,7 +30,7 @@
#include "bench.h" #include "bench.h"
#include "../src/utils.h" #include "../src/utils.h"
#ifndef _MSC_VER #ifndef _WIN32
#include <sys/time.h> #include <sys/time.h>
#else #else
#include <windows.h> #include <windows.h>

2
src/utils.h
View File

@ -40,7 +40,7 @@
# define F_OK 0 /* Test for existence. */ # define F_OK 0 /* Test for existence. */
#endif #endif
#ifdef _MSC_VER #ifdef _WIN32
# include <direct.h> # include <direct.h>
# include <io.h> # include <io.h>
# ifndef S_ISDIR # ifndef S_ISDIR

6
test/common.c
View File

@ -37,7 +37,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef _MSC_VER #ifdef _WIN32
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>
#else #else
@ -171,7 +171,7 @@ test_makedir(const char *parent, const char *path)
dirname = asprintf_safe("%s/%s", parent, path); dirname = asprintf_safe("%s/%s", parent, path);
assert(dirname); assert(dirname);
#ifdef _MSC_VER #ifdef _WIN32
err = _mkdir(dirname); err = _mkdir(dirname);
#else #else
err = mkdir(dirname, 0777); err = mkdir(dirname, 0777);
@ -184,7 +184,7 @@ test_makedir(const char *parent, const char *path)
char * char *
test_maketempdir(const char *template) test_maketempdir(const char *template)
{ {
#ifdef _MSC_VER #ifdef _WIN32
const char *basetmp = getenv("TMP"); const char *basetmp = getenv("TMP");
if (basetmp == NULL) { if (basetmp == NULL) {
basetmp = getenv("TEMP"); basetmp = getenv("TEMP");

2
test/test.h
View File

@ -88,7 +88,7 @@ test_compile_rules(struct xkb_context *context, const char *rules,
const char *options); const char *options);
#ifdef _MSC_VER #ifdef _WIN32
#define setenv(varname, value, overwrite) _putenv_s((varname), (value)) #define setenv(varname, value, overwrite) _putenv_s((varname), (value))
#define unsetenv(varname) _putenv_s(varname, "") #define unsetenv(varname) _putenv_s(varname, "")
#endif #endif

4
tools/tools-common.c
View File

@ -39,7 +39,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef _MSC_VER #ifdef _WIN32
#include <io.h> #include <io.h>
#include <windows.h> #include <windows.h>
#else #else
@ -160,7 +160,7 @@ tools_print_state_changes(enum xkb_state_component changed)
printf("]\n"); printf("]\n");
} }
#ifdef _MSC_VER #ifdef _WIN32
void void
tools_disable_stdin_echo(void) tools_disable_stdin_echo(void)
{ {

2
tools/tools-common.h
View File

@ -54,7 +54,7 @@ tools_enable_stdin_echo(void);
int int
tools_exec_command(const char *prefix, int argc, char **argv); 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 setenv(varname, value, overwrite) _putenv_s((varname), (value))
#define unsetenv(varname) _putenv_s(varname, "") #define unsetenv(varname) _putenv_s(varname, "")
#endif #endif