diff options
| author | Max Horn | 2011-06-06 17:05:35 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-06 17:05:35 +0200 |
| commit | 0a2fb9a465fe371daabf2a475fc20c5a870887c6 (patch) | |
| tree | adf744ec1ce91488e0ee627e7c8b834deeda8f87 | |
| parent | 96aed4d0577995709bcdf04d286f04979dc8e277 (diff) | |
| download | scummvm-rg350-0a2fb9a465fe371daabf2a475fc20c5a870887c6.tar.gz scummvm-rg350-0a2fb9a465fe371daabf2a475fc20c5a870887c6.tar.bz2 scummvm-rg350-0a2fb9a465fe371daabf2a475fc20c5a870887c6.zip | |
COMMON: Make more symbols forbidden
| -rw-r--r-- | common/forbidden.h | 44 | ||||
| -rw-r--r-- | common/system.cpp | 2 | ||||
| -rw-r--r-- | common/xmlparser.cpp | 1 | ||||
| -rw-r--r-- | engines/sword25/util/lua/ldblib.cpp | 4 |
4 files changed, 46 insertions, 5 deletions
diff --git a/common/forbidden.h b/common/forbidden.h index c551110d0e..995442d5fc 100644 --- a/common/forbidden.h +++ b/common/forbidden.h @@ -79,6 +79,21 @@ #define FILE FORBIDDEN_SYMBOL_REPLACEMENT #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stdin +#undef stdin +#define stdin FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stdout +#undef stdout +#define stdout FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stderr +#undef stderr +#define stderr FORBIDDEN_SYMBOL_REPLACEMENT +#endif + #ifndef FORBIDDEN_SYMBOL_EXCEPTION_fopen #undef fopen #define fopen(a,b) FORBIDDEN_SYMBOL_REPLACEMENT @@ -124,22 +139,41 @@ #define fputc(a,b) FORBIDDEN_SYMBOL_REPLACEMENT #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_fgets +#undef fgets +#define fgets(a,b,c) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_fputs +#undef fputs +#define fputs(a,b) FORBIDDEN_SYMBOL_REPLACEMENT +#endif #ifndef FORBIDDEN_SYMBOL_EXCEPTION_getc #undef getc #define getc(a) FORBIDDEN_SYMBOL_REPLACEMENT #endif -#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getchar -#undef getchar -#define getchar() FORBIDDEN_SYMBOL_REPLACEMENT -#endif - #ifndef FORBIDDEN_SYMBOL_EXCEPTION_putc #undef putc #define putc(a,b) FORBIDDEN_SYMBOL_REPLACEMENT #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_gets +#undef gets +#define gets(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_puts +#undef puts +#define puts(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getchar +#undef getchar +#define getchar() FORBIDDEN_SYMBOL_REPLACEMENT +#endif + #ifndef FORBIDDEN_SYMBOL_EXCEPTION_putchar #undef putchar #define putchar(a) FORBIDDEN_SYMBOL_REPLACEMENT diff --git a/common/system.cpp b/common/system.cpp index 2a0dfd8dfd..cd6ee46335 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -24,6 +24,8 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_FILE #define FORBIDDEN_SYMBOL_EXCEPTION_fputs #define FORBIDDEN_SYMBOL_EXCEPTION_fflush +#define FORBIDDEN_SYMBOL_EXCEPTION_stdout +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr #include "common/system.h" #include "common/events.h" diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp index ea36f0bb4a..5217c4e82c 100644 --- a/common/xmlparser.cpp +++ b/common/xmlparser.cpp @@ -22,6 +22,7 @@ // FIXME: Avoid using fprintf #define FORBIDDEN_SYMBOL_EXCEPTION_fprintf +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr #include "common/xmlparser.h" diff --git a/engines/sword25/util/lua/ldblib.cpp b/engines/sword25/util/lua/ldblib.cpp index b2e249e9b7..4d0333b46e 100644 --- a/engines/sword25/util/lua/ldblib.cpp +++ b/engines/sword25/util/lua/ldblib.cpp @@ -4,6 +4,10 @@ ** See Copyright Notice in lua.h */ +#define FORBIDDEN_SYMBOL_EXCEPTION_stdin +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr +#define FORBIDDEN_SYMBOL_EXCEPTION_fputs +#define FORBIDDEN_SYMBOL_EXCEPTION_fgets #include <stdio.h> #include <stdlib.h> |