diff options
Diffstat (limited to 'common/util.h')
-rw-r--r-- | common/util.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/common/util.h b/common/util.h index c17557a077..986fb1cc4e 100644 --- a/common/util.h +++ b/common/util.h @@ -26,6 +26,7 @@ #define COMMON_UTIL_H #include "common/scummsys.h" +#include "common/console.h" #include "common/str.h" @@ -293,28 +294,4 @@ void updateGameGUIOptions(const uint32 options); } // End of namespace Common - -#if defined(__GNUC__) -void error(const char *s, ...) GCC_PRINTF(1, 2) NORETURN; -#else -void NORETURN error(const char *s, ...); -#endif - -#ifdef DISABLE_TEXT_CONSOLE - -inline int printf(const char *s, ...) { return 0; } - -inline void warning(const char *s, ...) {} - -#else - -/** - * Print a warning message to the text console (stderr). - * Automatically prepends the text "WARNING: " and appends - * an exclamation mark and a newline. - */ -void warning(const char *s, ...) GCC_PRINTF(1, 2); - -#endif - #endif |