pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added missing function prototype and changed its signature.

Browse source 
Signature was changed to prevent a header for SDL_GLContext.
This commit is contained in:
Philipp Wiesemann 2013-08-04 23:38:25 +02:00
parent 2ec969cb57
commit 7e69cee4c5
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -364,9 +364,9 @@ SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion,
return success ? SDL_TRUE : SDL_FALSE; return success ? SDL_TRUE : SDL_FALSE;
} }
SDL_bool Android_JNI_DeleteContext(SDL_GLContext context) SDL_bool Android_JNI_DeleteContext(void)
{ {
/* There's only one context, so the parameter is ignored for now */ /* There's only one context, so no parameter for now */
JNIEnv *env = Android_JNI_GetEnv(); JNIEnv *env = Android_JNI_GetEnv();
(*env)->CallStaticVoidMethod(env, mActivityClass, midDeleteGLContext); (*env)->CallStaticVoidMethod(env, mActivityClass, midDeleteGLContext);
return SDL_TRUE; return SDL_TRUE;

1
src/core/android/SDL_android.h
View file

@ -31,6 +31,7 @@ extern "C" {
/* Interface from the SDL library into the Android Java activity */ /* Interface from the SDL library into the Android Java activity */
extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples); extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
extern SDL_bool Android_JNI_DeleteContext(void);
extern void Android_JNI_SwapWindow(); extern void Android_JNI_SwapWindow();
extern void Android_JNI_SetActivityTitle(const char *title); extern void Android_JNI_SetActivityTitle(const char *title);
extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]); extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);

2
src/video/android/SDL_androidgl.c
View file

@ -120,7 +120,7 @@ void
Android_GL_DeleteContext(_THIS, SDL_GLContext context) Android_GL_DeleteContext(_THIS, SDL_GLContext context)
{ {
if (context) { if (context) {
Android_JNI_DeleteContext(context); Android_JNI_DeleteContext();
} }
} }