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.
This commit is contained in:
Sam Lantinga 2013-08-04 09:23:55 -07:00
parent 1e3605c00f
commit 12b0ad39fc

View file

@ -20,6 +20,13 @@
*/ */
#include "SDL_config.h" #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" #include "SDL_rect.h"
/* Interface from the SDL library into the Android Java activity */ /* Interface from the SDL library into the Android Java activity */
@ -61,4 +68,11 @@ int Android_JNI_SetupThread(void);
/* Generic messages */ /* Generic messages */
int Android_JNI_SendMessage(int command, int param); 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: */ /* vi: set ts=4 sw=4 expandtab: */