diff options
| author | Max Horn | 2011-05-03 14:29:01 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-03 14:29:01 +0200 |
| commit | a50c36d1381be2e7d0748a2c734e41357fd4920f (patch) | |
| tree | 441789dd50bdebb972290b63de730096a4149a17 /backends/platform/android/gfx.cpp | |
| parent | 1a570c14e37fd9d48eb9b3f9f9611eb1a7541f9c (diff) | |
| download | scummvm-rg350-a50c36d1381be2e7d0748a2c734e41357fd4920f.tar.gz scummvm-rg350-a50c36d1381be2e7d0748a2c734e41357fd4920f.tar.bz2 scummvm-rg350-a50c36d1381be2e7d0748a2c734e41357fd4920f.zip | |
ANDROID: Fix various forbidden symbol clashes
Diffstat (limited to 'backends/platform/android/gfx.cpp')
| -rw-r--r-- | backends/platform/android/gfx.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index fae428d29f..ebce58e291 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -25,6 +25,23 @@ #if defined(__ANDROID__) +// Allow use of stuff in <time.h> +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h + +// Disable printf override in common/forbidden.h to avoid +// clashes with log.h from the Android SDK. +// That header file uses +// __attribute__ ((format(printf, 3, 4))) +// which gets messed up by our override mechanism; this could +// be avoided by either changing the Android SDK to use the equally +// legal and valid +// __attribute__ ((format(printf, 3, 4))) +// or by refining our printf override to use a varadic macro +// (which then wouldn't be portable, though). +// Anyway, for now we just disable the printf override globally +// for the Android port +#define FORBIDDEN_SYMBOL_EXCEPTION_printf + #include "common/endian.h" #include "graphics/conversion.h" |