elm: Remove _EFL_APP_VERSION_SET from ELM_MAIN

Desktop / Enlightenment / EFL Core Libraries - Jean-Philippe Andre [samsung.com] - 16 August 2016 04:26 EDT

This macro is behind a BETA ifdef. Shouldn't be used here, unless we want to remove the beta flag and stabilize efl_build_version_set() now.

Thanks Stefan for the report.

@fix

###

diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 655e844..962d01f 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -70,13 +70,13 @@ typedef Eina_Bool (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas
extern EAPI double _elm_startup_time;

#ifndef ELM_LIB_QUICKLAUNCH
-#define ELM_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
+#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
#else
/** @deprecated macro to be used after the elm_main() function.
* Do not define ELM_LIB_QUICKLAUNCH
* Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable).
*/
-#define ELM_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); ret = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; }
+#define ELM_MAIN() int main(int argc, char **argv) { int ret; _elm_startup_time = ecore_time_unix_get(); ret = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; }
#endif


114c22f elm: Remove _EFL_APP_VERSION_SET from ELM_MAIN
src/lib/elementary/elm_general.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Upstream: git.enlightenment.org


  • Share