From 1358738cac811e1cb86fdfb326bec1db3aeca77e Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Mon, 12 Nov 2018 21:15:41 +0900 Subject: [PATCH] Declared in C style for calling from app-launcher Declared in C style for calling from app-launcher Change-Id: Ic5b1c9eb4cc100829e5d94b3c9cbae26959d2915 Signed-off-by: huiyu.eun --- .../adaptor-framework/application-devel.cpp | 11 +++++++---- .../devel-api/adaptor-framework/application-devel.h | 21 +++++++++++++-------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dali/devel-api/adaptor-framework/application-devel.cpp b/dali/devel-api/adaptor-framework/application-devel.cpp index c7bfa39..cfdd55d 100644 --- a/dali/devel-api/adaptor-framework/application-devel.cpp +++ b/dali/devel-api/adaptor-framework/application-devel.cpp @@ -25,10 +25,6 @@ namespace Dali namespace DevelApplication { -void PreInitialize( int* argc, char** argv[] ) -{ - Internal::Adaptor::Application::PreInitialize( argc, argv ); -} bool AddIdleWithReturnValue( Application application, CallbackBase* callback ) { @@ -66,3 +62,10 @@ std::string GetDataPath() } // namespace DevelApplication } // namespace Dali + +extern "C" +void PreInitialize( int* argc, char** argv[] ) +{ + Dali::Internal::Adaptor::Application::PreInitialize( argc, argv ); +} + diff --git a/dali/devel-api/adaptor-framework/application-devel.h b/dali/devel-api/adaptor-framework/application-devel.h index bb0c140..bc96727 100644 --- a/dali/devel-api/adaptor-framework/application-devel.h +++ b/dali/devel-api/adaptor-framework/application-devel.h @@ -26,14 +26,7 @@ namespace Dali namespace DevelApplication { -/** - * @brief This is used to improve application launch performance. - * It preloads so files, initializes some functions in advance and makes a window in advance. - * - * @param[in,out] argc A pointer to the number of arguments - * @param[in,out] argv A pointer to the argument list - */ -DALI_ADAPTOR_API void PreInitialize( int* argc, char** argv[] ); + /** * @brief Ensures that the function passed in is called from the main loop when it is idle. @@ -95,4 +88,16 @@ DALI_ADAPTOR_API std::string GetDataPath(); } // namespace Dali +/** + * @brief This is used to improve application launch performance. + * It preloads so files, initializes some functions in advance and makes a window in advance. + * @param[in,out] argc A pointer to the number of arguments + * @param[in,out] argv A pointer to the argument list + * + * @note Declared in C style for calling from app-launcher. + * + */ +extern "C" +DALI_ADAPTOR_API void PreInitialize( int* argc, char** argv[] ); + #endif // DALI_APPLICATION_DEVEL_H -- 2.7.4