From 0024ee916dd965fb6ef08e7a4b1a6697f7523cda Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 4 Aug 2013 09:23:55 -0700 Subject: [PATCH] Allow C++ code to include SDL_android.h Alexey Petruchik Although SDL_android.h is not intended to be included by client code sometimes it needed. For example you need JNIEnv pointer to make JNI calls to modified SDLActivity.java (video playback, facebook integration, in-apps). It seems a bit weird to write: extern "C" { #include "SDL_android.h" } in my AndroidJNI.cpp file. --- src/core/android/SDL_android.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/core/android/SDL_android.h b/src/core/android/SDL_android.h index 9045eb5df..d53652f88 100644 --- a/src/core/android/SDL_android.h +++ b/src/core/android/SDL_android.h @@ -20,6 +20,13 @@ */ #include "SDL_config.h" +/* Set up for C function definitions, even when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +extern "C" { +/* *INDENT-ON* */ +#endif + #include "SDL_rect.h" /* Interface from the SDL library into the Android Java activity */ @@ -61,4 +68,11 @@ int Android_JNI_SetupThread(void); /* Generic messages */ int Android_JNI_SendMessage(int command, int param); +/* Ends C function definitions when using C++ */ +#ifdef __cplusplus +/* *INDENT-OFF* */ +} +/* *INDENT-ON* */ +#endif + /* vi: set ts=4 sw=4 expandtab: */