summaryrefslogtreecommitdiff
path: root/src/SDL2/include/SDL_system.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/SDL2/include/SDL_system.h')
-rw-r--r--src/SDL2/include/SDL_system.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/SDL2/include/SDL_system.h b/src/SDL2/include/SDL_system.h
index 47e55757..26e9eaa0 100644
--- a/src/SDL2/include/SDL_system.h
+++ b/src/SDL2/include/SDL_system.h
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
- Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
+ Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -21,7 +21,7 @@
/**
* \file SDL_system.h
- *
+ *
* Include file for platform specific SDL API functions
*/
@@ -38,9 +38,7 @@
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
-/* *INDENT-OFF* */
extern "C" {
-/* *INDENT-ON* */
#endif
/* Platform specific functions for iOS */
@@ -62,6 +60,9 @@ extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv();
/* Get the SDL Activity object for the application
This returns jobject, but the prototype is void* so we don't need jni.h
+ The jobject returned by SDL_AndroidGetActivity is a local reference.
+ It is the caller's responsibility to properly release it
+ (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef)
*/
extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity();
@@ -95,9 +96,7 @@ extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
-/* *INDENT-OFF* */
}
-/* *INDENT-ON* */
#endif
#include "close_code.h"