From f455215ef52d3a339f3545c30d9c5dbc6ea99ef0 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Tue, 14 Nov 2017 20:10:33 -0800 Subject: [PATCH] ecore: always declare EFL_MAIN not just for application using the BETA flag. --- src/lib/ecore/efl_general.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h index 3a79e46d33..2c850c7095 100644 --- a/src/lib/ecore/efl_general.h +++ b/src/lib/ecore/efl_general.h @@ -1,18 +1,3 @@ -#ifdef EFL_BETA_API_SUPPORT - -// This file is designed to be included again and again -// so cleanup last inclusion before generating this one. -#undef _EFL_VERSION_MICRO -#undef _EFL_VERSION_REVISION -#undef _EFL_VERSION_FLAVOR -#undef _EFL_BUILD_ID -#undef _EFL_APP_VERSION_SET -#undef __EFL_MAIN_CONSTRUCTOR -#undef __EFL_MAIN_DESTRUCTOR -#undef __EFL_UI -#undef __EFL_NET -#undef EFL_MAIN -#undef EFL_MAIN_EX #undef EAPI_MAIN #ifdef _WIN32 @@ -30,6 +15,21 @@ # define EAPI_MAIN # endif #endif /* ! _WIN32 */ +#ifdef EFL_BETA_API_SUPPORT + +// This file is designed to be included again and again +// so cleanup last inclusion before generating this one. +#undef _EFL_VERSION_MICRO +#undef _EFL_VERSION_REVISION +#undef _EFL_VERSION_FLAVOR +#undef _EFL_BUILD_ID +#undef _EFL_APP_VERSION_SET +#undef __EFL_MAIN_CONSTRUCTOR +#undef __EFL_MAIN_DESTRUCTOR +#undef __EFL_UI +#undef __EFL_NET +#undef EFL_MAIN +#undef EFL_MAIN_EX #ifdef EFL_VERSION_MICRO # define _EFL_VERSION_MICRO EFL_VERSION_MICRO