eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Use the correct return type for SDL_GetAndroidJNIEnv()"

Browse source 
This reverts commit 2d3fa03d53.

Different JDK implementations define JNIEnv differently for C++, so we can't provide the definition here.

Fixes:
/usr/lib/jvm/temurin-11-jdk-amd64/include/jni.h:195:17: error: conflicting declaration ‘typedef struct JNIEnv_ JNIEnv’
/home/runner/work/sdlwiki/sdlwiki/.github/../external/SDL3/include/SDL3/SDL_system.h:266:24: note: previous declaration as ‘typedef struct _JNIEnv JNIEnv’
This commit is contained in:
Sam Lantinga 2024-10-19 10:17:33 -07:00
parent ffb1d9e4b4
commit 153f90a725
5 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/android/SDL_android.c
View file

@ -2177,7 +2177,7 @@ bool Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *b
//////////////////////////////////////////////////////////////////////////////
*/
JNIEnv *SDL_GetAndroidJNIEnv(void)
void *SDL_GetAndroidJNIEnv(void)
{
return Android_JNI_GetEnv();
}