diff options
| author | Nitrus | 2018-11-20 18:56:36 +0100 |
|---|---|---|
| committer | David Turner | 2018-11-21 07:54:49 +0000 |
| commit | 2122c07d5fdddbb1c28dd7dd17fa8c1df1a4c28f (patch) | |
| tree | e3b8e8e540687ac8413243512a40a7a883499c70 | |
| parent | b782705a204705aed8af56e5bbf79cde9eb29f51 (diff) | |
| download | scummvm-rg350-2122c07d5fdddbb1c28dd7dd17fa8c1df1a4c28f.tar.gz scummvm-rg350-2122c07d5fdddbb1c28dd7dd17fa8c1df1a4c28f.tar.bz2 scummvm-rg350-2122c07d5fdddbb1c28dd7dd17fa8c1df1a4c28f.zip | |
3DS: Update header inclusions and forbidden symbols
| -rw-r--r-- | backends/platform/3ds/config.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/3ds/options-dialog.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/3ds/osystem-events.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/3ds/osystem.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/3ds/osystem.h | 3 | ||||
| -rw-r--r-- | backends/platform/3ds/sprite.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/3ds/sprite.h | 5 |
7 files changed, 14 insertions, 5 deletions
diff --git a/backends/platform/3ds/config.cpp b/backends/platform/3ds/config.cpp index bfadc5ac06..663c6aede8 100644 --- a/backends/platform/3ds/config.cpp +++ b/backends/platform/3ds/config.cpp @@ -20,11 +20,12 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h + #include "config.h" #include "osystem.h" #include "options-dialog.h" #include "common/config-manager.h" -#include <3ds.h> namespace _3DS { diff --git a/backends/platform/3ds/options-dialog.cpp b/backends/platform/3ds/options-dialog.cpp index 60fe7f818f..080ef29aec 100644 --- a/backends/platform/3ds/options-dialog.cpp +++ b/backends/platform/3ds/options-dialog.cpp @@ -20,6 +20,8 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h + #include "options-dialog.h" #include "config.h" #include "gui/dialog.h" diff --git a/backends/platform/3ds/osystem-events.cpp b/backends/platform/3ds/osystem-events.cpp index 064540fa66..de0f58426c 100644 --- a/backends/platform/3ds/osystem-events.cpp +++ b/backends/platform/3ds/osystem-events.cpp @@ -20,12 +20,14 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h + +#include "osystem.h" #include "backends/timer/default/default-timer.h" #include "engines/engine.h" #include "gui.h" #include "options-dialog.h" #include "config.h" -#include "osystem.h" namespace _3DS { diff --git a/backends/platform/3ds/osystem.cpp b/backends/platform/3ds/osystem.cpp index e19ff8f8de..c42e208b40 100644 --- a/backends/platform/3ds/osystem.cpp +++ b/backends/platform/3ds/osystem.cpp @@ -24,6 +24,7 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_time_h #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h +#include <3ds.h> #include "osystem.h" #include "backends/saves/default/default-saves.h" diff --git a/backends/platform/3ds/osystem.h b/backends/platform/3ds/osystem.h index cad46a18dc..6901295640 100644 --- a/backends/platform/3ds/osystem.h +++ b/backends/platform/3ds/osystem.h @@ -23,7 +23,8 @@ #ifndef PLATFORM_3DS_H #define PLATFORM_3DS_H -#include <citro3d.h> +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h + #include "backends/mutex/mutex.h" #include "backends/base-backend.h" #include "graphics/palette.h" diff --git a/backends/platform/3ds/sprite.cpp b/backends/platform/3ds/sprite.cpp index 842729c051..7d860743a2 100644 --- a/backends/platform/3ds/sprite.cpp +++ b/backends/platform/3ds/sprite.cpp @@ -22,7 +22,6 @@ #include "backends/platform/3ds/sprite.h" #include "common/util.h" -#include <3ds.h> static uint nextHigher2(uint v) { if (v == 0) diff --git a/backends/platform/3ds/sprite.h b/backends/platform/3ds/sprite.h index 129c2689e7..35c048c24b 100644 --- a/backends/platform/3ds/sprite.h +++ b/backends/platform/3ds/sprite.h @@ -23,8 +23,11 @@ #ifndef GRAPHICS_SPRITE_3DS_H #define GRAPHICS_SPRITE_3DS_H -#include <citro3d.h> +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h + #include "graphics/surface.h" +#include <3ds.h> +#include <citro3d.h> #define TEXTURE_TRANSFER_FLAGS \ (GX_TRANSFER_FLIP_VERT(1) | GX_TRANSFER_OUT_TILED(1) | GX_TRANSFER_RAW_COPY(0) | \ |