mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-07-08 18:29:43 +00:00
Cygwin: testautomation run-time fix
[sdl-ci-filter cygwin] [sdl-ci-filter msys2-*]
This commit is contained in:
committed by
Sam Lantinga
parent
7418e1aef1
commit
ad86dc9811
@@ -22,7 +22,7 @@
|
||||
|
||||
#include "SDL_getenv_c.h"
|
||||
|
||||
#if defined(SDL_PLATFORM_WINDOWS)
|
||||
#if defined(SDL_PLATFORM_WINDOWS) && !defined(SDL_PLATFORM_CYGWIN)
|
||||
#include "../core/windows/SDL_windows.h"
|
||||
#endif
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "../core/android/SDL_android.h"
|
||||
#endif
|
||||
|
||||
#if defined(SDL_PLATFORM_WINDOWS)
|
||||
#if defined(SDL_PLATFORM_WINDOWS) && !defined(SDL_PLATFORM_CYGWIN)
|
||||
#define HAVE_WIN32_ENVIRONMENT
|
||||
#elif defined(HAVE_GETENV) && \
|
||||
(defined(HAVE_SETENV) || defined(HAVE_PUTENV)) && \
|
||||
@@ -103,7 +103,7 @@ SDL_Environment *SDL_CreateEnvironment(bool populated)
|
||||
env->lock = SDL_CreateMutex();
|
||||
|
||||
if (populated) {
|
||||
#ifdef SDL_PLATFORM_WINDOWS
|
||||
#if defined(SDL_PLATFORM_WINDOWS) && !defined(SDL_PLATFORM_CYGWIN)
|
||||
LPWCH strings = GetEnvironmentStringsW();
|
||||
if (strings) {
|
||||
for (LPWCH string = strings; *string; string += SDL_wcslen(string) + 1) {
|
||||
@@ -146,7 +146,7 @@ SDL_Environment *SDL_CreateEnvironment(bool populated)
|
||||
SDL_InsertIntoHashTable(env->strings, variable, value, true);
|
||||
}
|
||||
}
|
||||
#endif // SDL_PLATFORM_WINDOWS
|
||||
#endif // SDL_PLATFORM_WINDOWS && !SDL_PLATFORM_CYGWIN
|
||||
}
|
||||
|
||||
return env;
|
||||
|
||||
Reference in New Issue
Block a user