felipealmeida pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e1de58a3ad25a8bfca0ef0a88d67e3493343819e
commit e1de58a3ad25a8bfca0ef0a88d67e3493343819e Author: Felipe Magno de Almeida <fel...@expertisesolutions.com.br> Date: Tue Feb 9 13:28:25 2016 -0200 efl: Renamed Ecore.Time to Efl.Time and defined it Moved the Ecore.Time @extern struct to Efl lib and defined it as specified in C specification for struct tm. Thus, bindings can be automatically generated for where struct tm is used. --- src/Makefile_Efl.am | 1 + src/lib/ecore/Ecore_Common.h | 11 ----------- src/lib/ecore/ecore_types.eot | 8 -------- src/lib/efl/Efl.h | 11 +++++++++++ src/lib/efl/efl_types.eot | 20 ++++++++++++++++++++ 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index 4b6f6c0..e98a74f 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -25,6 +25,7 @@ efl_eolian_files = \ efl_eolian_type_files = \ lib/efl/interfaces/efl_gfx_types.eot \ + lib/efl/efl_types.eot \ $(NULL) efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h) \ diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h index 11fc219..e958cce 100644 --- a/src/lib/ecore/Ecore_Common.h +++ b/src/lib/ecore/Ecore_Common.h @@ -6,17 +6,6 @@ extern "C" { #include "ecore_types.eot.h" - -/** - * @ingroup Ecore - * @since 1.18 - * - * This type is a alias to struct tm. - * It is intended to be a standard way to reference it in .eo files. - * Each language should manually bind it. - */ -typedef struct tm Ecore_Time; - /** * @defgroup Ecore_Init_Group Ecore initialization, shutdown functions and reset on fork. * @ingroup Ecore diff --git a/src/lib/ecore/ecore_types.eot b/src/lib/ecore/ecore_types.eot index 11e5cdf..6e5744e 100644 --- a/src/lib/ecore/ecore_types.eot +++ b/src/lib/ecore/ecore_types.eot @@ -1,12 +1,4 @@ -struct @extern Ecore.Time; [[ - This type is a alias for struct tm. - It is intended to be a standard way to reference - it in .eo files. - Each language should manually bind it. - @since 1.18 - ]] - enum Ecore.Pos_Map { [[Defines the position mappings for the animation.]] diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index b45b791..c02161f 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -37,6 +37,17 @@ extern "C" { #ifdef EFL_BETA_API_SUPPORT +#include "efl_types.eot.h" + +/** + * @ingroup Efl + * @since 1.18 + * + * This type is a alias to struct tm. + * It is intended to be a standard way to reference it in .eo files. + */ +typedef struct tm Efl_Time; + #include <Efl_Model_Common.h> /* Data types */ diff --git a/src/lib/efl/efl_types.eot b/src/lib/efl/efl_types.eot new file mode 100644 index 0000000..dd6d08c --- /dev/null +++ b/src/lib/efl/efl_types.eot @@ -0,0 +1,20 @@ + +struct @extern Efl.Time +{ + [[This type is a alias for struct tm. + It is intended to be a standard way to reference + it in .eo files. + + @since 1.18 + ]] + + tm_sec: int; [[Seconds. [0-60] (1 leap second)]] + tm_min: int; [[Minutes. [0-59] ]] + tm_hour: int; [[Hours. [0-23] ]] + tm_mday: int; [[Day. [1-31] ]] + tm_mon: int; [[Month. [0-11] ]] + tm_year: int; [[Year - 1900.]] + tm_wday: int; [[Day of week. [0-6] ]] + tm_yday: int; [[Days in year.[0-365] ]] + tm_isdst: int; [[DST. [-1/0/1] ]] +} --