diff options
| author | Max Horn | 2011-05-23 19:11:19 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-23 19:12:26 +0200 |
| commit | 6f6051a9e1da4d4debc1bf851b101c7a40d8b531 (patch) | |
| tree | a5054a3d9cc10b436358bd8fe87347ab0267f452 | |
| parent | 590c6ede63d9fa61d2b05ce74596b043f5c79bc8 (diff) | |
| download | scummvm-rg350-6f6051a9e1da4d4debc1bf851b101c7a40d8b531.tar.gz scummvm-rg350-6f6051a9e1da4d4debc1bf851b101c7a40d8b531.tar.bz2 scummvm-rg350-6f6051a9e1da4d4debc1bf851b101c7a40d8b531.zip | |
COMMON: Mark more symbols as forbidden
| -rw-r--r-- | backends/fs/posix/posix-fs.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/sdl/posix/posix.cpp | 1 | ||||
| -rw-r--r-- | common/forbidden.h | 41 |
3 files changed, 43 insertions, 0 deletions
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 4d69a51a03..7f2ca695c5 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -26,6 +26,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_time_h #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir +#define FORBIDDEN_SYMBOL_EXCEPTION_getenv #include "backends/fs/posix/posix-fs.h" #include "backends/fs/stdiostream.h" diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp index 84bbf55a92..4dd0039c1e 100644 --- a/backends/platform/sdl/posix/posix.cpp +++ b/backends/platform/sdl/posix/posix.cpp @@ -20,6 +20,7 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_getenv #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir #define FORBIDDEN_SYMBOL_EXCEPTION_time_h //On IRIX, sys/stat.h includes sys/time.h diff --git a/common/forbidden.h b/common/forbidden.h index d769ff38be..d9282b7885 100644 --- a/common/forbidden.h +++ b/common/forbidden.h @@ -140,6 +140,26 @@ #define system(a) FORBIDDEN_SYMBOL_REPLACEMENT #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_getenv +#undef getenv +#define getenv(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_putenv +#undef putenv +#define putenv(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_setenv +#undef setenv +#define setenv(a,b,c) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_unsetenv +#undef unsetenv +#define unsetenv(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + // // Disable various symbols from time.h @@ -281,6 +301,27 @@ #endif +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_stricmp +#undef stricmp +#define stricmp(a,b) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_strnicmp +#undef strnicmp +#define strnicmp(a,b,c) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_strcasecmp +#undef strcasecmp +#define strcasecmp(a,b) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#ifndef FORBIDDEN_SYMBOL_EXCEPTION_strncasecmp +#undef strncasecmp +#define strncasecmp(a,b,c) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + + /* * We also would like to disable the following symbols; * however, these are also frequently used in regular code, |