ANDROID: Fix various forbidden symbol clashes
This commit is contained in:
parent
1a570c14e3
commit
a50c36d138
5 changed files with 82 additions and 0 deletions
|
@ -28,6 +28,20 @@
|
||||||
// Allow use of stuff in <time.h>
|
// Allow use of stuff in <time.h>
|
||||||
#define FORBIDDEN_SYMBOL_EXCEPTION_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 <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
#include <sys/system_properties.h>
|
#include <sys/system_properties.h>
|
||||||
|
|
|
@ -25,6 +25,23 @@
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
#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/events.h"
|
#include "common/events.h"
|
||||||
|
|
||||||
#include "backends/platform/android/android.h"
|
#include "backends/platform/android/android.h"
|
||||||
|
|
|
@ -25,6 +25,23 @@
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
#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 "common/endian.h"
|
||||||
#include "graphics/conversion.h"
|
#include "graphics/conversion.h"
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,23 @@
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
#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 "base/main.h"
|
#include "base/main.h"
|
||||||
#include "base/version.h"
|
#include "base/version.h"
|
||||||
#include "common/config-manager.h"
|
#include "common/config-manager.h"
|
||||||
|
|
|
@ -25,6 +25,23 @@
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
#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 "base/main.h"
|
#include "base/main.h"
|
||||||
#include "graphics/surface.h"
|
#include "graphics/surface.h"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue