From: Daekwang Ryu <dkdk.ryu@samsung.com>
Date: Mon, 18 Jul 2022 08:16:55 +0000 (+0900)
Subject: Remove SDL_tizen_app_init in SDL_DYNAMIC_API
X-Git-Tag: accepted/tizen/7.0/unified/20221110.062637^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2FSDL.git;a=commitdiff_plain;h=4082c472b782b58eb8bed9b9480ec5e501f4fc9c

Remove SDL_tizen_app_init in SDL_DYNAMIC_API

It can cause a issue when using SDL_DYNAMIC_API feature

Change-Id: If0702589e45d711ad25587b8e1afda516cd414e3
---

diff --git a/include/SDL_main.h b/include/SDL_main.h
index f8fa8f1..4d780a0 100644
--- a/include/SDL_main.h
+++ b/include/SDL_main.h
@@ -161,7 +161,7 @@ extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * r
 
 #endif /* __WINRT__ */
 
-extern DECLSPEC int SDLCALL SDL_tizen_app_init(int argc, char *argv[]);
+extern int SDL_tizen_app_init(int argc, char *argv[]);
 
 #if defined(__IPHONEOS__)
 
diff --git a/src/core/tizen/SDL_tizen.c b/src/core/tizen/SDL_tizen.c
index 0b64575..a17fbde 100644
--- a/src/core/tizen/SDL_tizen.c
+++ b/src/core/tizen/SDL_tizen.c
@@ -37,6 +37,10 @@
 
 #include "SDL_tizen.h"
 
+#undef DECLSPEC
+#undef SDLCALL
+#include "begin_code.h"
+
 static int tizen_appcore_initialized = 0;
 static appcore_context_h appcore_handle = NULL;
 static app_event_handler_h handlers[5] = {NULL, };
@@ -281,8 +285,7 @@ static int AppControl(bundle *b, void *data)
     return APP_ERROR_NONE;
 }
 
-int
-SDL_tizen_app_init(int argc, char *argv[])
+DECLSPEC int SDLCALL SDL_tizen_app_init(int argc, char *argv[])
 {
     int aul_ret = 0;
 
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index e74d917..221a193 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -669,7 +669,6 @@
 #define SDL_WinRTGetDeviceFamily SDL_WinRTGetDeviceFamily_REAL
 #define SDL_log10 SDL_log10_REAL
 #define SDL_log10f SDL_log10f_REAL
-#define SDL_tizen_app_init SDL_tizen_app_init_REAL
 #define SDL_GameControllerMappingForDeviceIndex SDL_GameControllerMappingForDeviceIndex_REAL
 #define SDL_LinuxSetThreadPriority SDL_LinuxSetThreadPriority_REAL
 #define SDL_HasAVX512F SDL_HasAVX512F_REAL
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index f37b30a..4aee1c4 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -627,7 +627,6 @@ SDL_DYNAPI_PROC(int,SDL_GetDisplayDPI,(int a, float *b, float *c, float *d),(a,b
 SDL_DYNAPI_PROC(SDL_JoystickPowerLevel,SDL_JoystickCurrentPowerLevel,(SDL_Joystick *a),(a),return)
 SDL_DYNAPI_PROC(SDL_GameController*,SDL_GameControllerFromInstanceID,(SDL_JoystickID a),(a),return)
 SDL_DYNAPI_PROC(SDL_Joystick*,SDL_JoystickFromInstanceID,(SDL_JoystickID a),(a),return)
-
 SDL_DYNAPI_PROC(int,SDL_GetDisplayUsableBounds,(int a, SDL_Rect *b),(a,b),return)
 SDL_DYNAPI_PROC(int,SDL_GetWindowBordersSize,(SDL_Window *a, int *b, int *c, int *d, int *e),(a,b,c,d,e),return)
 SDL_DYNAPI_PROC(int,SDL_SetWindowOpacity,(SDL_Window *a, float b),(a,b),return)
@@ -708,7 +707,6 @@ SDL_DYNAPI_PROC(SDL_bool,SDL_IsAndroidTV,(void),(),return)
 #endif
 SDL_DYNAPI_PROC(double,SDL_log10,(double a),(a),return)
 SDL_DYNAPI_PROC(float,SDL_log10f,(float a),(a),return)
-SDL_DYNAPI_PROC(int,SDL_tizen_app_init,(int a, char *b[]),(a,b),return)
 SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForDeviceIndex,(int a),(a),return)
 #ifdef __LINUX__
 SDL_DYNAPI_PROC(int,SDL_LinuxSetThreadPriority,(Sint64 a, int b),(a,b),return)