e_comp_wl: move typedef declaration to internal header

Change-Id: I034b7889c89b06854ce9ae3c10e1d8346726ee91

diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c
index 8f8e7e00db825090a1485852a564c7a5c9dab01c..9c08ef8a48e0df398d8139136b5768a5d3b1e3fe 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window.c
+++ b/src/bin/displaymgr/e_hwc_window.c
@@ -21,6 +21,7 @@
 #include "e_view_client_intern.h"
 #include "e_output_intern.h"
 #include "e_zone_intern.h"
+#include "e_compositor_intern.h"
 
 #include <pixman.h>
 #include <wayland-tbm-server.h>

diff --git a/src/bin/displaymgr/e_hwc_windows.c b/src/bin/displaymgr/e_hwc_windows.c
index 2e01e87395a207255ba6f96a52c0b9d65f278eae..6bfa3144877b4b17040ddb6170cf173534ace932 100644 (file)
--- a/src/bin/displaymgr/e_hwc_windows.c
+++ b/src/bin/displaymgr/e_hwc_windows.c
@@ -21,6 +21,7 @@
 #include "e_view_client_intern.h"
 #include "e_canvas_intern.h"
 #include "e_zone_intern.h"
+#include "e_compositor_intern.h"
 
 # include <Evas_Engine_GL_Tbm.h>
 # include <Evas_Engine_Software_Tbm.h>

diff --git a/src/bin/server/e_comp_wl_input.c b/src/bin/server/e_comp_wl_input.c
index 3007572fb47a15ecccad03582d9f8d602de317e4..d3350fa30a7942e54c4669fc03051a0e3187022b 100644 (file)
--- a/src/bin/server/e_comp_wl_input.c
+++ b/src/bin/server/e_comp_wl_input.c
@@ -14,6 +14,7 @@
 #include "e_seat_intern.h"
 #include "e_comp_cfdata_intern.h"
 #include "e_config_intern.h"
+#include "e_compositor_intern.h"
 
 #include <sys/mman.h>
 #include <fcntl.h>

diff --git a/src/bin/server/e_comp_wl_intern.h b/src/bin/server/e_comp_wl_intern.h
index 2a5193ea9ba82ab96c99aa189df5780ea9bda1bc..bca69a3caa368d908ca67c1e11166adecdfed1fb 100644 (file)
--- a/src/bin/server/e_comp_wl_intern.h
+++ b/src/bin/server/e_comp_wl_intern.h
@@ -5,7 +5,6 @@
 #include "e_comp_wl.h"
 #include "e_policy_wl.h"
 #include "e_device_intern.h"
-#include "e_compositor_intern.h"
 #include "e_seat_intern.h"
 #include "e_devicemgr_intern.h"
 #include "e_dnd_intern.h"
@@ -14,6 +13,8 @@
 #include <pixman.h>
 
 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_Pointer_Constraint E_Comp_Wl_Pointer_Constraint;
 
 typedef enum _E_Comp_Wl_Sh_Surf_Role
 {

diff --git a/src/bin/server/e_seat.c b/src/bin/server/e_seat.c
index f23fa75db0febc72781fc32c1ff03b52737ac6a7..394ab3a2857bf40983173a5b4636d0b197598f6c 100644 (file)
--- a/src/bin/server/e_seat.c
+++ b/src/bin/server/e_seat.c
@@ -13,6 +13,7 @@
 #include "e_comp_cfdata_intern.h"
 #include "e_config_intern.h"
 #include "e_devicemgr_intern.h"
+#include "e_client_intern.h"
 
 struct _E_Seat
 {

diff --git a/src/bin/server/e_tizen_launch_effect.c b/src/bin/server/e_tizen_launch_effect.c
index ace132a382dc72ffc36992f52f9e78b711463960..9ddffe59b14b01eb29960d5a978a8aed9875591c 100644 (file)
--- a/src/bin/server/e_tizen_launch_effect.c
+++ b/src/bin/server/e_tizen_launch_effect.c
@@ -14,6 +14,7 @@
 #include "e_comp_canvas_intern.h"
 #include "e_config_intern.h"
 #include "e_view_rect.h"
+#include "e_client_intern.h"
 
 #include <tizen-launch-server-protocol.h>
 

diff --git a/src/bin/windowmgr/e_dnd.c b/src/bin/windowmgr/e_dnd.c
index fcd0058aa21732c70675328d337bd712ba8a0c3a..b28076a587bb6261e2cf29d09df247f659374d2f 100644 (file)
--- a/src/bin/windowmgr/e_dnd.c
+++ b/src/bin/windowmgr/e_dnd.c
@@ -12,6 +12,7 @@
 #include "e_policy_desk_area_intern.h"
 #include "e_pointer_intern.h"
 #include "e_devicemgr_intern.h"
+#include "e_client_intern.h"
 
 #include "services/e_service_kvm_intern.h"
 

diff --git a/src/bin/windowmgr/e_policy_conformant.c b/src/bin/windowmgr/e_policy_conformant.c
index 2f6bf12d42abb42a79085c516ecffcb708335ea2..4e7accae1c066e647f18ab06b2bbb00927d65355 100644 (file)
--- a/src/bin/windowmgr/e_policy_conformant.c
+++ b/src/bin/windowmgr/e_policy_conformant.c
@@ -4,6 +4,7 @@
 #include "e_comp_object_intern.h"
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
+#include "e_client_intern.h"
 
 #include <wayland-server.h>
 #include <tizen-extension-server-protocol.h>

diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h
index 23f8fe26c7f9744aeb16df3a775261ab15945640..1689a8fccbdc4027f09b73d04597e9763602f343 100644 (file)
--- a/src/include/e_comp_wl.h
+++ b/src/include/e_comp_wl.h
@@ -33,7 +33,6 @@ extern "C" {
 typedef struct _E_Comp_Wl_Hook E_Comp_Wl_Hook;
 typedef struct _E_Comp_Wl_Pid_Hook E_Comp_Wl_Pid_Hook;
 
-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_Aux_Hint          E_Comp_Wl_Aux_Hint;
 typedef struct _E_Comp_Wl_Buffer_Viewport   E_Comp_Wl_Buffer_Viewport;
@@ -41,7 +40,6 @@ typedef struct _E_Comp_Wl_Subsurf_Data      E_Comp_Wl_Subsurf_Data;
 typedef struct _E_Comp_Wl_Shell_Surface_Api E_Comp_Wl_Shell_Surface_Api;
 typedef struct _E_Comp_Wl_Output            E_Comp_Wl_Output;
 typedef struct _E_Comp_Wl_Intercept_Hook    E_Comp_Wl_Intercept_Hook;
-typedef struct _E_Comp_Wl_Pointer_Constraint E_Comp_Wl_Pointer_Constraint;
 
 typedef enum _E_Comp_Wl_Buffer_Type
 {