e_blender: make an internal header

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

Change-Id: Ie0b7f79e163289a80781e4bb6a32e993730d9f46

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 4a5ffd1..ffe9450 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -142,8 +142,7 @@ src/bin/e_foreign_private.h \
 src/bin/e_map.h \
 src/bin/e_wtz_shell.h \
 src/bin/e_device.h \
-src/bin/e_input_event.h \
-src/bin/e_blender.h
+src/bin/e_input_event.h
 
 enlightenment_src = \
 src/bin/e_actions.c \

diff --git a/src/bin/e_blender.c b/src/bin/e_blender.c
index 093f388..15ca899 100644 (file)
--- a/src/bin/e_blender.c
+++ b/src/bin/e_blender.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_blender_intern.h"
+
 #include <wtz-blender-server-protocol.h>
 
 static E_Blender *_blender = NULL;

diff --git a/src/bin/e_blender.h b/src/bin/e_blender_intern.h
similarity index 83%
rename from src/bin/e_blender.h
rename to src/bin/e_blender_intern.h
index 96a36c3..d9b96e3 100644 (file)
--- a/src/bin/e_blender.h
+++ b/src/bin/e_blender_intern.h
@@ -1,12 +1,9 @@
-#ifdef E_TYPEDEFS
+#ifndef E_BLENDER_INTERN_H
+#define E_BLENDER_INTERN_H
 
 typedef struct _E_Blender E_Blender;
 typedef struct _E_Blend E_Blend;
 
-#else
-#ifndef E_BLENDER_H
-#define E_BLENDER_H
-
 struct _E_Blender
 {
    struct wl_global *global;
@@ -28,5 +25,4 @@ struct _E_Blend
 EINTERN Eina_Bool e_blender_init(void);
 EINTERN void      e_blender_shutdown(void);
 
-#endif // E_BLENDER_H
-#endif
+#endif // E_BLENDER_INTERN_H

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 195ab9c..caef2ad 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -4,6 +4,7 @@
 #include "e_comp_wl_private.h"
 #include "e_client_intern.h"
 #include "e_appinfo_intern.h"
+#include "e_blender_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index cbf43f8..b892ddd 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -87,4 +87,3 @@
 #include "e_comp_wl_tizen_hwc.h"
 #include "e_comp_wl_renderer.h"
 #include "e_map.h"
-#include "e_blender.h"