From fcd271dd1b5140d13135c0c3602e9b5ad5d9f6cc Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Sat, 12 Aug 2017 15:13:53 +0200 Subject: [PATCH] e_comp_wl: move types into typedef section WIth this we dont need a second define of the same type in e_comp.h This fixes a duplicated definition warning --- src/bin/e_comp.h | 1 - src/bin/e_comp_wl.h | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h index 48e2f21de..881a7eaf4 100644 --- a/src/bin/e_comp.h +++ b/src/bin/e_comp.h @@ -4,7 +4,6 @@ typedef struct _E_Comp E_Comp; #ifdef E_COMP_WL typedef struct _E_Comp_Wl_Client_Data E_Comp_Client_Data; #endif -typedef struct _E_Comp_Wl_Data E_Comp_Wl_Data; #ifdef E_COMP_X typedef struct _E_Comp_X_Client_Data E_Comp_Client_Data; diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h index d01acdc3e..fe4d1a149 100644 --- a/src/bin/e_comp_wl.h +++ b/src/bin/e_comp_wl.h @@ -1,4 +1,14 @@ #ifdef E_TYPEDEFS +typedef struct _E_Comp_Wl_Aux_Hint E_Comp_Wl_Aux_Hint; +typedef struct _E_Comp_Wl_Buffer E_Comp_Wl_Buffer; +typedef struct _E_Comp_Wl_Subsurf_Data E_Comp_Wl_Subsurf_Data; +typedef struct _E_Comp_Wl_Surface_State E_Comp_Wl_Surface_State; +typedef struct _E_Comp_Wl_Client_Data E_Comp_Wl_Client_Data; +typedef struct _E_Comp_Wl_Data E_Comp_Wl_Data; +typedef struct _E_Comp_Wl_Output E_Comp_Wl_Output; +typedef struct E_Shell_Data E_Shell_Data; +typedef struct Tizen_Extensions Tizen_Extensions; +typedef void (*E_Comp_Wl_Grab_End_Cb)(E_Client*); #else # ifndef E_COMP_WL_H # define E_COMP_WL_H @@ -38,16 +48,6 @@ const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \ (type *)(void *)( (char *)__mptr - offsetof(type,member) ); \ }) -typedef struct _E_Comp_Wl_Aux_Hint E_Comp_Wl_Aux_Hint; -typedef struct _E_Comp_Wl_Buffer E_Comp_Wl_Buffer; -typedef struct _E_Comp_Wl_Subsurf_Data E_Comp_Wl_Subsurf_Data; -typedef struct _E_Comp_Wl_Surface_State E_Comp_Wl_Surface_State; -typedef struct _E_Comp_Wl_Client_Data E_Comp_Wl_Client_Data; -typedef struct _E_Comp_Wl_Data E_Comp_Wl_Data; -typedef struct _E_Comp_Wl_Output E_Comp_Wl_Output; -typedef struct E_Shell_Data E_Shell_Data; -typedef struct Tizen_Extensions Tizen_Extensions; -typedef void (*E_Comp_Wl_Grab_End_Cb)(E_Client*); struct _E_Comp_Wl_Aux_Hint {