Merge commit '0a9a0a79e0a40a2843c1f6d33f7fa45bb1042fc0' into main

main
Sam Lantinga 2022-06-29 17:25:26 -07:00
commit d800f95dca
2 changed files with 9 additions and 5 deletions

View File

@ -245,6 +245,8 @@ extern DECLSPEC int SDLCALL SDL_UIKitRunApp(int argc, char *argv[], SDL_main_fun
* \param reserved reserved for future use; should be NULL * \param reserved reserved for future use; should be NULL
* \returns 0 on success or -1 on failure; call SDL_GetError() to retrieve * \returns 0 on success or -1 on failure; call SDL_GetError() to retrieve
* more information on the failure. * more information on the failure.
*
* \since This function is available since SDL 2.24.0.
*/ */
extern DECLSPEC int SDLCALL SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved); extern DECLSPEC int SDLCALL SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved);

View File

@ -599,12 +599,14 @@ typedef struct XTaskQueueObject * XTaskQueueHandle;
* Gets a reference to the global async task queue handle for GDK, * Gets a reference to the global async task queue handle for GDK,
* initializing if needed. * initializing if needed.
* *
* Once you are done with the task queue, you should call XTaskQueueCloseHandle * Once you are done with the task queue, you should call
* to reduce the reference count to avoid a resource leak. * XTaskQueueCloseHandle to reduce the reference count to avoid a resource
* leak.
* *
* \param outTaskQueue a pointer to be filled in with task queue handle. * \param outTaskQueue a pointer to be filled in with task queue handle.
* \returns 0 if success, -1 if any error occurs. * \returns 0 if success, -1 if any error occurs.
* *
* \since This function is available since SDL 2.24.0.
*/ */
extern DECLSPEC int SDLCALL SDL_GDKGetTaskQueue(XTaskQueueHandle * outTaskQueue); extern DECLSPEC int SDLCALL SDL_GDKGetTaskQueue(XTaskQueueHandle * outTaskQueue);