From e58e5eda0829ac5d66c874486ddb9edd7dfcd76d Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Sun, 1 May 2016 17:01:22 +0200 Subject: [PATCH] efl: remove eina_promise typedef fixes the following warnings: /usr/local/include/efl-1/Efl_Model_Common.h:14:30: warning: redefinition of typedef 'Eina_Promise' is a C11 feature [-Wtypedef-redefinition] typedef struct _Eina_Promise Eina_Promise; ^ /usr/local/include/eina-1/eina/eina_promise.h:10:30: note: previous definition is here typedef struct _Eina_Promise Eina_Promise; To remove the typedef i had to cleanup the includes of header in evas_canvas3d_eet.c. --- src/lib/efl/Efl_Model_Common.h | 2 -- src/lib/evas/canvas/evas_canvas3d_eet.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h index 0ccccc1..60fe220 100644 --- a/src/lib/efl/Efl_Model_Common.h +++ b/src/lib/efl/Efl_Model_Common.h @@ -11,8 +11,6 @@ EAPI extern Eina_Error EFL_MODEL_ERROR_INIT_FAILED; EAPI extern Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE; EAPI extern Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED; -typedef struct _Eina_Promise Eina_Promise; - /** * @struct _Efl_Model_Children_Event * Every time a child id added the event diff --git a/src/lib/evas/canvas/evas_canvas3d_eet.c b/src/lib/evas/canvas/evas_canvas3d_eet.c index a3803a6..353e291 100644 --- a/src/lib/evas/canvas/evas_canvas3d_eet.c +++ b/src/lib/evas/canvas/evas_canvas3d_eet.c @@ -1,5 +1,3 @@ -#include -#include #include "evas_common_private.h" #include "evas_private.h" -- 2.7.4