don't use warning suppression on Maemo

"#pragma GCC diagnostic not allowed inside functions"
This commit is contained in:
Sebastian Krzyszkowiak 2018-12-08 06:27:51 +01:00
parent b737d64ce8
commit f82dc24a88
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
2 changed files with 3 additions and 1 deletions

View file

@ -42,7 +42,7 @@
#if defined(__clang__) || defined(__codemodel__) #if defined(__clang__) || defined(__codemodel__)
#define SUPPRESS_WARNING(x) _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wpragmas\"") _Pragma(STRINGIFY(clang diagnostic ignored x)) #define SUPPRESS_WARNING(x) _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wpragmas\"") _Pragma(STRINGIFY(clang diagnostic ignored x))
#define SUPPRESS_END _Pragma("clang diagnostic pop") #define SUPPRESS_END _Pragma("clang diagnostic pop")
#elif defined(__GNUC__) #elif defined(__GNUC__) && !defined(MAEMO5)
#define SUPPRESS_WARNING(x) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wpragmas\"") _Pragma(STRINGIFY(GCC diagnostic ignored x)) #define SUPPRESS_WARNING(x) _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wpragmas\"") _Pragma(STRINGIFY(GCC diagnostic ignored x))
#define SUPPRESS_END _Pragma("GCC diagnostic pop") #define SUPPRESS_END _Pragma("GCC diagnostic pop")
#else #else

View file

@ -553,6 +553,7 @@ SYMBOL_EXPORT void DisableCompositor(struct Game* game) {
} }
SYMBOL_EXPORT char* StrToLower(struct Game* game, char* text) { SYMBOL_EXPORT char* StrToLower(struct Game* game, char* text) {
// FIXME: UTF-8
char *res = strdup(text), *iter = res; char *res = strdup(text), *iter = res;
while (*iter) { while (*iter) {
*iter = tolower(*iter); *iter = tolower(*iter);
@ -562,6 +563,7 @@ SYMBOL_EXPORT char* StrToLower(struct Game* game, char* text) {
} }
SYMBOL_EXPORT char* StrToUpper(struct Game* game, char* text) { SYMBOL_EXPORT char* StrToUpper(struct Game* game, char* text) {
// FIXME: UTF-8
char *res = strdup(text), *iter = res; char *res = strdup(text), *iter = res;
while (*iter) { while (*iter) {
*iter = toupper(*iter); *iter = toupper(*iter);