diff options
| author | Cameron Cawley | 2018-04-07 17:45:47 +0100 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-04-07 22:12:18 +0000 |
| commit | 925025ec54bd27678f3b0c0d5f69d80636b073f5 (patch) | |
| tree | ce8306626ced911c67c867c6df387f80b15d6edf | |
| parent | fc00f80e7dc6ea396a5f4756914fc26ecb376a10 (diff) | |
| download | scummvm-rg350-925025ec54bd27678f3b0c0d5f69d80636b073f5.tar.gz scummvm-rg350-925025ec54bd27678f3b0c0d5f69d80636b073f5.tar.bz2 scummvm-rg350-925025ec54bd27678f3b0c0d5f69d80636b073f5.zip | |
DS: Only disable forbidden symbols when necessary
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 5 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.h | 4 | ||||
| -rw-r--r-- | backends/plugins/ds/ds-provider.cpp | 4 |
4 files changed, 12 insertions, 5 deletions
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index e44e360d5b..42708d299b 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -68,8 +68,9 @@ // - Try discworld? -#define FORBIDDEN_SYMBOL_ALLOW_ALL - +// Allow use of stuff in <nds.h> +#define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #include <nds.h> diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 03d336e804..c35433d3fc 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -23,7 +23,9 @@ // Allow use of stuff in <time.h> #define FORBIDDEN_SYMBOL_EXCEPTION_time_h -#define FORBIDDEN_SYMBOL_ALLOW_ALL +// Allow use of stuff in <nds.h> +#define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #include "common/scummsys.h" #include "common/system.h" diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h index 585f72bd31..c8698ca418 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -24,7 +24,9 @@ #ifndef _OSYSTEM_DS_H_ #define _OSYSTEM_DS_H_ -#define FORBIDDEN_SYMBOL_ALLOW_ALL +// Allow use of stuff in <nds.h> +#define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #include "backends/base-backend.h" #include "common/events.h" diff --git a/backends/plugins/ds/ds-provider.cpp b/backends/plugins/ds/ds-provider.cpp index b21c48355d..c5419a989a 100644 --- a/backends/plugins/ds/ds-provider.cpp +++ b/backends/plugins/ds/ds-provider.cpp @@ -20,7 +20,9 @@ * */ -#define FORBIDDEN_SYMBOL_ALLOW_ALL +// Allow use of stuff in <nds.h> +#define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h #include "common/scummsys.h" |