diff --git a/radio/src/thirdparty/libopenui/src/libopenui_compat.h b/radio/src/thirdparty/libopenui/src/libopenui_compat.h new file mode 100644 index 000000000..ac94b9670 --- /dev/null +++ b/radio/src/thirdparty/libopenui/src/libopenui_compat.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) OpenTX + * + * Source: + * https://github.com/opentx/libopenui + * + * This file is a part of libopenui library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ + +#pragma once + +#if defined(__MINGW32__) || !defined(__GNUC__) + #include + #include + #define sleep(x) Sleep(x) + #define strcasecmp _stricmp + #define strncasecmp _strnicmp + #define chdir _chdir + #define getcwd _getcwd + // remove windows default definitions + #undef OPAQUE + #undef RGB + #undef EXTERN_C +#endif diff --git a/radio/src/thirdparty/libopenui/src/libopenui_defines.h b/radio/src/thirdparty/libopenui/src/libopenui_defines.h index 86ad01e18..3606bd4b1 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_defines.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_defines.h @@ -20,6 +20,7 @@ #pragma once #include "libopenui_types.h" +#include "libopenui_compat.h" /* obsolete flags */ #define BLINK 0 @@ -73,20 +74,6 @@ #define GET_BLUE(color) \ (((color) & 0x001F) << 3) -#if defined(__MINGW32__) || !defined(__GNUC__) - #include - #include - #define sleep(x) Sleep(x) - #define strcasecmp _stricmp - #define strncasecmp _strnicmp - #define chdir _chdir - #define getcwd _getcwd - // remove windows default definitions - #undef OPAQUE - #undef RGB - #undef EXTERN_C -#endif - #define OPACITY_MAX 0x0Fu #define OPACITY(value) ((value) << 24u) diff --git a/radio/src/thirdparty/libopenui/src/libopenui_file.h b/radio/src/thirdparty/libopenui/src/libopenui_file.h index e250a7a1b..62f36bfa8 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_file.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_file.h @@ -19,7 +19,7 @@ #pragma once -#include "libopenui_defines.h" // for strcasecmp / VC++ +#include "libopenui_compat.h" // for strcasecmp / VC++ #include #include #include