mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-05-28 15:39:10 +00:00
Revert "Use the correct return type for SDL_GetAndroidJNIEnv()"
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:
parent
ffb1d9e4b4
commit
153f90a725
5 changed files with 11 additions and 18 deletions
|
@ -261,13 +261,6 @@ extern SDL_DECLSPEC void SDLCALL SDL_SetiOSEventPump(bool enabled);
|
|||
/*
|
||||
* Platform specific functions for Android
|
||||
*/
|
||||
|
||||
#if defined(__cplusplus)
|
||||
typedef struct _JNIEnv JNIEnv;
|
||||
#else
|
||||
typedef const struct JNINativeInterface* JNIEnv;
|
||||
#endif
|
||||
|
||||
#ifdef SDL_PLATFORM_ANDROID
|
||||
|
||||
/**
|
||||
|
@ -290,7 +283,7 @@ typedef const struct JNINativeInterface* JNIEnv;
|
|||
*
|
||||
* \sa SDL_GetAndroidActivity
|
||||
*/
|
||||
extern SDL_DECLSPEC JNIEnv * SDLCALL SDL_GetAndroidJNIEnv(void);
|
||||
extern SDL_DECLSPEC void * SDLCALL SDL_GetAndroidJNIEnv(void);
|
||||
|
||||
/**
|
||||
* Retrieve the Java instance of the Android activity class.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue