Skip to content

O
OpenBoard
Commit e9936c45 authored by shibakaneki's avatar shibakaneki
Browse files
Options

Merge branch 'master' of github.com:Sankore/Sankore-3.1 

	modified:   src/globals/UBGlobals.h
parents 65dc0422 f5e37779
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/globals/UBGlobals.h
View file @ e9936c45
...@@ -34,6 +34,7 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\""); ...@@ -34,6 +34,7 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
//disabling some warnings //disabling some warnings
#define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE #define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#else #else
// just save old state (needs for not empty define) // just save old state (needs for not empty define)
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE #define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
...@@ -43,4 +44,4 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\""); ...@@ -43,4 +44,4 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
#endif //#ifdef Q_WS_WIN #endif //#ifdef Q_WS_WIN
#endif // UBGLOBALS_H #endif // UBGLOBALS_H
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment