e_comp_wl_data: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: I1e1020afb55fa50b6f1410fc21044b7b6bc623f6

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 7b24468..de8e80c 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -73,7 +73,6 @@ src/bin/e_zone.h \
 src/bin/e_util_transform.h \
 src/bin/e_comp_screen.h \
 src/bin/e_info_protocol.h \
-src/bin/e_comp_wl_data.h \
 src/bin/e_comp_wl_input.h \
 src/bin/e_comp_wl.h \
 src/bin/e_comp_wl_subsurface.h \

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index c74e0d9..85a13be 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -10,15 +10,14 @@
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_capture_intern.h"
+#include "e_comp_wl_data_intern.h"
 
 #include <tizen-extension-server-protocol.h>
-
 #include <relative-pointer-unstable-v1-server-protocol.h>
 #include <pointer-constraints-unstable-v1-server-protocol.h>
 
 #include <wayland-tbm-server.h>
 #include <glib.h>
-
 #include <libds/log.h>
 #include <libds/single_pixel_buffer_v1.h>
 

diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index d3339f1..b53919b 100644 (file)
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -1,5 +1,6 @@
 #define EXECUTIVE_MODE_ENABLED
 #include "e.h"
+#include "e_comp_wl_data_intern.h"
 #include "e_comp_canvas_intern.h"
 
 typedef struct {
@@ -18,7 +19,7 @@ _mime_types_free(E_Comp_Wl_Data_Source *source)
    eina_array_free(source->mime_types);
 }
 
-static void 
+static void
 _e_comp_wl_data_offer_cb_accept(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t serial, const char *mime_type)
 {
    E_Comp_Wl_Data_Offer *offer;

diff --git a/src/bin/e_comp_wl_data.h b/src/bin/e_comp_wl_data_intern.h
similarity index 97%
rename from src/bin/e_comp_wl_data.h
rename to src/bin/e_comp_wl_data_intern.h
index c73671a..49bd6bb 100644 (file)
--- a/src/bin/e_comp_wl_data.h
+++ b/src/bin/e_comp_wl_data_intern.h
@@ -1,7 +1,5 @@
-#ifdef E_TYPEDEFS
-#else
-# ifndef E_COMP_WL_DATA_H
-#  define E_COMP_WL_DATA_H
+#ifndef E_COMP_WL_DATA_INTERN_H
+#define E_COMP_WL_DATA_INTERN_H
 
 #  include "e_comp_wl.h"
 
@@ -110,5 +108,5 @@ EINTERN int e_comp_wl_data_current_device_id_get(void);
 EINTERN void e_comp_wl_data_offer_mimetype_action_accept(E_Comp_Wl_Data_Offer *offer);
 EINTERN void e_comp_wl_data_secondary_add(E_Client *ec);
 EINTERN void e_comp_wl_data_secondary_remove(E_Client *ec);
-# endif
+
 #endif

diff --git a/src/bin/e_compositor.c b/src/bin/e_compositor.c
index e9a6f38..c89585c 100644 (file)
--- a/src/bin/e_compositor.c
+++ b/src/bin/e_compositor.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_comp_wl_private.h"
+#include "e_comp_wl_data_intern.h"
 
 #include <libds/compositor.h>
 #include <libds/subcompositor.h>

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 2176d47..1ccdfe9 100644 (file)
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_comp_wl_data_intern.h"
 
 struct _E_Drag_Hook
 {

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index ffa20f2..a8a8467 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -49,7 +49,6 @@
 #include "e_egl_sync.h"
 #include "e_comp_wl.h"
 #include "e_comp_wl_subsurface.h"
-#include "e_comp_wl_data.h"
 #include "e_comp_wl_input.h"
 #include "e_comp_wl_tbm.h"
 #include "e_comp_wl_rsm.h"

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index a23daf5..1826f2a 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -18,6 +18,7 @@
 #include "e_subsurface_watcher.h"
 #include "e_client_intern.h"
 #include "e_subsurface_watcher_intern.h"
+#include "e_comp_wl_data_intern.h"
 
 #include <device/display.h>
 #include <wayland-server.h>

diff --git a/src/bin/services/e_service_kvm.c b/src/bin/services/e_service_kvm.c
index 35267f8..107d61e 100644 (file)
--- a/src/bin/services/e_service_kvm.c
+++ b/src/bin/services/e_service_kvm.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "services/e_service_kvm.h"
+#include "e_comp_wl_data_intern.h"
 
 #include <wayland-server.h>
 #include <tzsh_server.h>