Added missing function prototype and changed its signature.
authorPhilipp Wiesemann <philipp.wiesemann@arcor.de>
Sun, 04 Aug 2013 23:38:25 +0200
changeset 7575930f21eaacd7
parent 7574 006f7a09ea1c
child 7576 26d8b2096c49
Added missing function prototype and changed its signature.
Signature was changed to prevent a header for SDL_GLContext.
src/core/android/SDL_android.c
src/core/android/SDL_android.h
src/video/android/SDL_androidgl.c
     1.1 --- a/src/core/android/SDL_android.c	Sun Aug 04 23:28:34 2013 +0200
     1.2 +++ b/src/core/android/SDL_android.c	Sun Aug 04 23:38:25 2013 +0200
     1.3 @@ -364,9 +364,9 @@
     1.4      return success ? SDL_TRUE : SDL_FALSE;
     1.5  }
     1.6  
     1.7 -SDL_bool Android_JNI_DeleteContext(SDL_GLContext context) 
     1.8 +SDL_bool Android_JNI_DeleteContext(void)
     1.9  {
    1.10 -    /* There's only one context, so the parameter is ignored for now */
    1.11 +    /* There's only one context, so no parameter for now */
    1.12      JNIEnv *env = Android_JNI_GetEnv();
    1.13      (*env)->CallStaticVoidMethod(env, mActivityClass, midDeleteGLContext);
    1.14      return SDL_TRUE;
     2.1 --- a/src/core/android/SDL_android.h	Sun Aug 04 23:28:34 2013 +0200
     2.2 +++ b/src/core/android/SDL_android.h	Sun Aug 04 23:38:25 2013 +0200
     2.3 @@ -31,6 +31,7 @@
     2.4  
     2.5  /* Interface from the SDL library into the Android Java activity */
     2.6  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);
     2.7 +extern SDL_bool Android_JNI_DeleteContext(void);
     2.8  extern void Android_JNI_SwapWindow();
     2.9  extern void Android_JNI_SetActivityTitle(const char *title);
    2.10  extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
     3.1 --- a/src/video/android/SDL_androidgl.c	Sun Aug 04 23:28:34 2013 +0200
     3.2 +++ b/src/video/android/SDL_androidgl.c	Sun Aug 04 23:38:25 2013 +0200
     3.3 @@ -120,7 +120,7 @@
     3.4  Android_GL_DeleteContext(_THIS, SDL_GLContext context)
     3.5  {
     3.6      if (context) {
     3.7 -        Android_JNI_DeleteContext(context);
     3.8 +        Android_JNI_DeleteContext();
     3.9      }
    3.10  }
    3.11