From 360740ac766f29ff78bd5aa0ba1380c72f1cebdb Mon Sep 17 00:00:00 2001
From: Amir <[EMAIL REDACTED]>
Date: Fri, 19 Feb 2021 18:07:53 +0300
Subject: [PATCH] correct dynapi
---
include/SDL_system.h | 26 +++++++++++++-------------
src/dynapi/SDL_dynapi_overrides.h | 2 +-
src/dynapi/SDL_dynapi_procs.h | 4 +++-
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/include/SDL_system.h b/include/SDL_system.h
index adf1c0359..e62c9e5ee 100644
--- a/include/SDL_system.h
+++ b/include/SDL_system.h
@@ -216,19 +216,19 @@ extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(void);
extern DECLSPEC SDL_bool SDLCALL SDL_AndroidRequestPermission(const char *permission);
/**
- \brief Show android toast notification
-
- Show toast in UI thread [https://developer.android.com/guide/topics/ui/notifiers/toasts]
- Params description
- message : text message to be shown
- duration : 0 - short [https://developer.android.com/reference/android/widget/Toast#LENGTH_SHORT],
- 1 - long [https://developer.android.com/reference/android/widget/Toast#LENGTH_LONG]
- gravity : the location at which the notification should appear on the screen.
- It's an optional parameter. Set -1 if you don't want specify any gravity or
- choose some value from https://developer.android.com/reference/android/view/Gravity
- xOffset : set this parameter only when gravity >=0
- yOffset : set this parameter only when gravity >=0
- Returns 0 if success, -1 if any error occured.
+ \brief Shows android toast notification
+
+ \note Shows toast in UI thread [https://developer.android.com/guide/topics/ui/notifiers/toasts]
+
+ \param message : text message to be shown
+ duration : 0 - short [https://developer.android.com/reference/android/widget/Toast#LENGTH_SHORT],
+ 1 - long [https://developer.android.com/reference/android/widget/Toast#LENGTH_LONG]
+ gravity : the location at which the notification should appear on the screen.
+ It's an optional parameter. Set -1 if you don't want specify any gravity or
+ choose some value from https://developer.android.com/reference/android/view/Gravity
+ xOffset : set this parameter only when gravity >=0
+ yOffset : set this parameter only when gravity >=0
+ \return 0 if success, -1 if any error occurs.
*/
extern DECLSPEC int SDLCALL SDL_AndroidShowToast(const char* message, int duration, int gravity, int xOffset, int yOffset);
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index e32cd1fe6..60fe38831 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -766,7 +766,6 @@
#define SDL_GetPreferredLocales SDL_GetPreferredLocales_REAL
#define SDL_SIMDRealloc SDL_SIMDRealloc_REAL
#define SDL_AndroidRequestPermission SDL_AndroidRequestPermission_REAL
-#define SDL_AndroidShowToast SDL_AndroidShowToast_REAL
#define SDL_OpenURL SDL_OpenURL_REAL
#define SDL_HasSurfaceRLE SDL_HasSurfaceRLE_REAL
#define SDL_GameControllerHasLED SDL_GameControllerHasLED_REAL
@@ -808,3 +807,4 @@
#define SDL_ispunct SDL_ispunct_REAL
#define SDL_isprint SDL_isprint_REAL
#define SDL_isgraph SDL_isgraph_REAL
+#define SDL_AndroidShowToast SDL_AndroidShowToast_REAL
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index 61437c8d0..78a8255e1 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -826,7 +826,6 @@ SDL_DYNAPI_PROC(SDL_Locale *,SDL_GetPreferredLocales,(void),(),return)
SDL_DYNAPI_PROC(void*,SDL_SIMDRealloc,(void *a, const size_t b),(a, b),return)
#ifdef __ANDROID__
SDL_DYNAPI_PROC(SDL_bool,SDL_AndroidRequestPermission,(const char *a),(a),return)
-SDL_DYNAPI_PROC(int,SDL_AndroidShowToast,(const char* message, int duration, int gravity, int xOffset, int yOffset),(message,duration,gravity,xOffset,yOffset),return)
#endif
SDL_DYNAPI_PROC(int,SDL_OpenURL,(const char *a),(a),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_HasSurfaceRLE,(SDL_Surface *a),(a),return)
@@ -871,3 +870,6 @@ SDL_DYNAPI_PROC(int,SDL_isxdigit,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_ispunct,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_isprint,(int a),(a),return)
SDL_DYNAPI_PROC(int,SDL_isgraph,(int a),(a),return)
+#ifdef __ANDROID__
+SDL_DYNAPI_PROC(int,SDL_AndroidShowToast,(const char *a, int b, int c, int d, int e),(a,b,c,d,e),return)
+#endif