e_hwc_window: make an internal header

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

Change-Id: I0a8366aa4a0b462982fe3fcd086c899e62cf10aa

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 651cb58..d400d6e 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -8,6 +8,7 @@
 #include "e_comp_wl_intern.h"
 #include "e_client_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 
 #include <sys/xattr.h>

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 7080afc..7c0d583 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -15,6 +15,7 @@
 #include "e_comp_intern.h"
 #include "e_pixmap_intern.h"
 #include "e_map_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 
 /* data keys:

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 62281bc..b132455 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -14,6 +14,7 @@
 #include "e_pointer_intern.h"
 #include "e_output_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 
 #include "Eeze.h"

diff --git a/src/bin/e_comp_wl_tizen_hwc.c b/src/bin/e_comp_wl_tizen_hwc.c
index bdf456c..b317cd2 100644 (file)
--- a/src/bin/e_comp_wl_tizen_hwc.c
+++ b/src/bin/e_comp_wl_tizen_hwc.c
@@ -2,6 +2,7 @@
 #include "e_comp_wl_tizen_hwc_intern.h"
 #include "e_utils_intern.h"
 #include "e_error_intern.h"
+#include "e_hwc_window_intern.h"
 
 #include <tizen-hwc-server-protocol.h>
 

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index 3deab30..ce239ab 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -1,6 +1,7 @@
 #include "e.h"
-#include "e_hwc_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
+#include "e_hwc_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index 34a68da..f6d6d96 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 #include "e_hwc_intern.h"
 #include "e_comp_wl_buffer_intern.h"

diff --git a/src/bin/e_hwc_window.h b/src/bin/e_hwc_window.h
index d405e29..7d5812f 100644 (file)
--- a/src/bin/e_hwc_window.h
+++ b/src/bin/e_hwc_window.h
@@ -3,21 +3,12 @@
 typedef struct _E_Hwc_Window                      E_Hwc_Window;
 typedef struct _E_Hwc_Window_Target               E_Hwc_Window_Target;
 typedef struct _E_Hwc_Window_Buffer               E_Hwc_Window_Buffer;
-typedef struct _E_Hwc_Window_Commit_Data          E_Hwc_Window_Commit_Data;
-typedef struct _E_Hwc_Window_Hook                 E_Hwc_Window_Hook;
 typedef struct _E_Hwc_Window_Update_Data          E_Hwc_Window_Update_Data;
-typedef void (*E_Hwc_Window_Hook_Cb) (void *data, E_Hwc_Window *hwc_window);
 
 #else
 #ifndef E_HWC_WINDOW_H
 #define E_HWC_WINDOW_H
 
-#define E_HWC_WINDOW_TYPE (int)0xE0b11003
-#define E_HWC_WINDOW_ZPOS_NONE -999
-
-#define EHW_C(b,m)              (b ? ((b) >> (m)) & 0xFF : ' ')
-#define EHW_FOURCC_STR(id)      EHW_C(id,0), EHW_C(id,8), EHW_C(id,16), EHW_C(id,24)
-
 typedef enum _E_Hwc_Window_State
 {
    E_HWC_WINDOW_STATE_NONE,
@@ -27,6 +18,12 @@ typedef enum _E_Hwc_Window_State
    E_HWC_WINDOW_STATE_CURSOR,
 } E_Hwc_Window_State;
 
+typedef enum _E_Hwc_Window_Activation_State
+{
+   E_HWC_WINDOW_ACTIVATION_STATE_DEACTIVATED = 0,
+   E_HWC_WINDOW_ACTIVATION_STATE_ACTIVATED,
+} E_Hwc_Window_Activation_State;
+
 typedef enum _E_Hwc_Window_Transition
 {
    E_HWC_WINDOW_TRANSITION_NONE_TO_NONE,
@@ -45,27 +42,6 @@ typedef enum _E_Hwc_Window_Transition
    E_HWC_WINDOW_TRANSITION_CURSOR_TO_CURSOR
 } E_Hwc_Window_Transition;
 
-typedef enum _E_Hwc_Window_Activation_State
-{
-   E_HWC_WINDOW_ACTIVATION_STATE_DEACTIVATED = 0,
-   E_HWC_WINDOW_ACTIVATION_STATE_ACTIVATED,
-} E_Hwc_Window_Activation_State;
-
-typedef enum _E_Hwc_Window_Hook_Point
-{
-   E_HWC_WINDOW_HOOK_ACCEPTED_STATE_SET,
-   E_HWC_WINDOW_HOOK_LAST
-} E_Hwc_Window_Hook_Point;
-
-struct _E_Hwc_Window_Hook
-{
-   EINA_INLIST;
-   E_Hwc_Window_Hook_Point hookpoint;
-   E_Hwc_Window_Hook_Cb func;
-   void *data;
-   unsigned char delete_me : 1;
-};
-
 struct _E_Hwc_Window_Buffer
 {
    tbm_surface_h                  tsurface;
@@ -204,79 +180,5 @@ struct _E_Hwc_Window_Commit_Data {
    tdm_hwc_window_info            info;
 };
 
-EINTERN Eina_Bool               e_hwc_window_init(void);
-EINTERN void                    e_hwc_window_deinit(void);
-
-EINTERN E_Hwc_Window           *e_hwc_window_get(E_Hwc *hwc, E_Client *ec);
-EINTERN void                    e_hwc_window_ref(E_Hwc_Window *hwc_window);
-EINTERN void                    e_hwc_window_unref(E_Hwc_Window *hwc_window);
-
-EINTERN Eina_Bool               e_hwc_window_zpos_set(E_Hwc_Window *hwc_window, int zpos);
-EINTERN int                     e_hwc_window_zpos_get(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_composition_update(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_info_update(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_buffer_fetch(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_prop_update(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_is_target(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_is_video(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_is_cursor(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_video_set(E_Hwc_Window *hwc_window, Eina_Bool set);
-
-EINTERN E_Hwc_Window_Commit_Data *e_hwc_window_commit_data_acquire(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool                 e_hwc_window_commit_data_release(E_Hwc_Window *hwc_window, E_Hwc_Window_Commit_Data *commit_data);
-
-EINTERN Eina_Bool               e_hwc_window_activate(E_Hwc_Window *hwc_window, E_Hwc_Window_Queue *queue);
-EINTERN Eina_Bool               e_hwc_window_deactivate(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_is_on_hw_overlay(E_Hwc_Window *hwc_window);
-EINTERN tbm_surface_h           e_hwc_window_displaying_surface_get(E_Hwc_Window *hwc_window);
-
-EINTERN Eina_Bool               e_hwc_window_state_set(E_Hwc_Window *hwc_window, E_Hwc_Window_State state, Eina_Bool composition_update);
-EINTERN E_Hwc_Window_State      e_hwc_window_state_get(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_accepted_state_set(E_Hwc_Window *hwc_window, E_Hwc_Window_State state);
-EINTERN E_Hwc_Window_State      e_hwc_window_accepted_state_get(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_device_state_available_update(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_device_state_available_get(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_transition_set(E_Hwc_Window *hwc_window, E_Hwc_Window_Transition transition);
-EINTERN E_Hwc_Window_Transition e_hwc_window_transition_get(E_Hwc_Window *hwc_window);
-EINTERN const char*             e_hwc_window_transition_string_get(E_Hwc_Window_Transition transition);
-EINTERN const char*             e_hwc_window_restriction_string_get(E_Hwc_Window *hwc_window);
-
-EINTERN Eina_Bool               e_hwc_window_constraints_update(E_Hwc_Window *hwc_window);
-EINTERN void                    e_hwc_window_constraints_reset(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_rendered_window_update(E_Hwc_Window *hwc_window);
-EINTERN void                    e_hwc_window_buffer_set(E_Hwc_Window_Buffer *window_buffer, tbm_surface_h tsurface, E_Hwc_Window_Queue *queue, int transform);
-EINTERN const char             *e_hwc_window_state_string_get(E_Hwc_Window_State hwc_window_state);
-EINTERN const char             *e_hwc_window_name_get(E_Hwc_Window *hwc_window);
-EINTERN void                    e_hwc_window_name_set(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_set_property(E_Hwc_Window *hwc_window, unsigned int id, const char *name, tdm_value value, Eina_Bool force);
-EINTERN Eina_Bool               e_hwc_window_get_property(E_Hwc_Window *hwc_window, unsigned int id, tdm_value *value);
-EINTERN void                    e_hwc_window_client_type_override(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool               e_hwc_window_display_or_commit_buffer_check(E_Hwc_Window *hwc_window, tbm_surface_h tsurface);
-
-EINTERN E_Hwc_Window_Hook      *e_hwc_window_hook_add(E_Hwc_Window_Hook_Point hookpoint, E_Hwc_Window_Hook_Cb func, const void *data);
-EINTERN void                    e_hwc_window_hook_del(E_Hwc_Window_Hook *ch);
-
-EINTERN void                    e_hwc_window_trace_debug(Eina_Bool onoff);
-EINTERN void                    e_hwc_window_commit_data_buffer_dump(E_Hwc_Window *hwc_window, E_Hwc_Window_Commit_Data *commit_data);
-EINTERN Eina_Bool               e_hwc_window_fps_get(E_Hwc_Window *hwc_window, double *fps);
-
-EINTERN void                    e_hwc_window_presentation_time_feedback_present(E_Hwc_Window *hwc_window, uint64_t sequence, uint64_t tv_sec, uint64_t tv_usec);
-EINTERN void                    e_hwc_window_presentation_time_feedback_discard(E_Hwc_Window *hwc_window);
-EINTERN void                    e_hwc_window_presentation_time_feedback_take(E_Hwc_Window *hwc_window, E_Presentation_Time_Container *container);
-
-EINTERN Eina_Bool               e_hwc_window_present_sync(E_Hwc_Window *hwc_window);
-
-EINTERN E_Hwc_Window_Update_Data *e_hwc_window_pending_update_data_dequeue(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool                 e_hwc_window_pending_update_data_enqueue(E_Hwc_Window *hwc_window, E_Hwc_Window_Update_Data *update);
-EINTERN Eina_Bool                 e_hwc_window_pending_update_data_dequeue_cancel(E_Hwc_Window *hwc_window, E_Hwc_Window_Update_Data *update);
-EINTERN Eina_Bool                 e_hwc_window_pending_update_data_has(E_Hwc_Window *hwc_window);
-
-EINTERN Eina_Bool                 e_hwc_window_presentation_callback_pending_set(E_Hwc_Window *hwc_window, E_Hwc_Presentation_Callback *callback);
-EINTERN Eina_Bool                 e_hwc_window_presentation_callback_pending_take_over(E_Hwc_Window *hwc_window, E_Hwc_Presentation_Callback_List *dst_list);
-EINTERN Eina_Bool                 e_hwc_window_presentation_callback_take(E_Hwc_Window *hwc_window, E_Hwc_Presentation_Callback_List *src_list);
-EINTERN Eina_Bool                 e_hwc_window_presentation_callback_call(E_Hwc_Window *hwc_window);
-
-EINTERN void                      e_hwc_window_below_transparent_obj_set(E_Hwc_Window *hwc_window, Eina_Bool set);
-
 #endif // E_HWC_WINDOW_H
 #endif

diff --git a/src/bin/e_hwc_window_intern.h b/src/bin/e_hwc_window_intern.h
new file mode 100644 (file)
index 0000000..88c05ef
--- /dev/null
+++ b/src/bin/e_hwc_window_intern.h
@@ -0,0 +1,104 @@
+#ifndef E_HWC_WINDOW_INTERN_H
+#define E_HWC_WINDOW_INTERN_H
+
+#define E_HWC_WINDOW_TYPE (int)0xE0b11003
+#define E_HWC_WINDOW_ZPOS_NONE -999
+
+#define EHW_C(b,m)              (b ? ((b) >> (m)) & 0xFF : ' ')
+#define EHW_FOURCC_STR(id)      EHW_C(id,0), EHW_C(id,8), EHW_C(id,16), EHW_C(id,24)
+
+typedef struct _E_Hwc_Window_Commit_Data          E_Hwc_Window_Commit_Data;
+typedef struct _E_Hwc_Window_Hook                 E_Hwc_Window_Hook;
+
+typedef void (*E_Hwc_Window_Hook_Cb) (void *data, E_Hwc_Window *hwc_window);
+
+typedef enum _E_Hwc_Window_Hook_Point
+{
+   E_HWC_WINDOW_HOOK_ACCEPTED_STATE_SET,
+   E_HWC_WINDOW_HOOK_LAST
+} E_Hwc_Window_Hook_Point;
+
+struct _E_Hwc_Window_Hook
+{
+   EINA_INLIST;
+   E_Hwc_Window_Hook_Point hookpoint;
+   E_Hwc_Window_Hook_Cb func;
+   void *data;
+   unsigned char delete_me : 1;
+};
+
+EINTERN Eina_Bool               e_hwc_window_init(void);
+EINTERN void                    e_hwc_window_deinit(void);
+
+EINTERN E_Hwc_Window           *e_hwc_window_get(E_Hwc *hwc, E_Client *ec);
+EINTERN void                    e_hwc_window_ref(E_Hwc_Window *hwc_window);
+EINTERN void                    e_hwc_window_unref(E_Hwc_Window *hwc_window);
+
+EINTERN Eina_Bool               e_hwc_window_zpos_set(E_Hwc_Window *hwc_window, int zpos);
+EINTERN int                     e_hwc_window_zpos_get(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_composition_update(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_info_update(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_buffer_fetch(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_prop_update(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_is_target(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_is_video(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_is_cursor(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_video_set(E_Hwc_Window *hwc_window, Eina_Bool set);
+
+EINTERN E_Hwc_Window_Commit_Data *e_hwc_window_commit_data_acquire(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool                 e_hwc_window_commit_data_release(E_Hwc_Window *hwc_window, E_Hwc_Window_Commit_Data *commit_data);
+
+EINTERN Eina_Bool               e_hwc_window_activate(E_Hwc_Window *hwc_window, E_Hwc_Window_Queue *queue);
+EINTERN Eina_Bool               e_hwc_window_deactivate(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_is_on_hw_overlay(E_Hwc_Window *hwc_window);
+EINTERN tbm_surface_h           e_hwc_window_displaying_surface_get(E_Hwc_Window *hwc_window);
+
+EINTERN Eina_Bool               e_hwc_window_state_set(E_Hwc_Window *hwc_window, E_Hwc_Window_State state, Eina_Bool composition_update);
+EINTERN E_Hwc_Window_State      e_hwc_window_state_get(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_accepted_state_set(E_Hwc_Window *hwc_window, E_Hwc_Window_State state);
+EINTERN E_Hwc_Window_State      e_hwc_window_accepted_state_get(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_device_state_available_update(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_device_state_available_get(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_transition_set(E_Hwc_Window *hwc_window, E_Hwc_Window_Transition transition);
+EINTERN E_Hwc_Window_Transition e_hwc_window_transition_get(E_Hwc_Window *hwc_window);
+EINTERN const char*             e_hwc_window_transition_string_get(E_Hwc_Window_Transition transition);
+EINTERN const char*             e_hwc_window_restriction_string_get(E_Hwc_Window *hwc_window);
+
+EINTERN Eina_Bool               e_hwc_window_constraints_update(E_Hwc_Window *hwc_window);
+EINTERN void                    e_hwc_window_constraints_reset(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_rendered_window_update(E_Hwc_Window *hwc_window);
+EINTERN void                    e_hwc_window_buffer_set(E_Hwc_Window_Buffer *window_buffer, tbm_surface_h tsurface, E_Hwc_Window_Queue *queue, int transform);
+EINTERN const char             *e_hwc_window_state_string_get(E_Hwc_Window_State hwc_window_state);
+EINTERN const char             *e_hwc_window_name_get(E_Hwc_Window *hwc_window);
+EINTERN void                    e_hwc_window_name_set(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_set_property(E_Hwc_Window *hwc_window, unsigned int id, const char *name, tdm_value value, Eina_Bool force);
+EINTERN Eina_Bool               e_hwc_window_get_property(E_Hwc_Window *hwc_window, unsigned int id, tdm_value *value);
+EINTERN void                    e_hwc_window_client_type_override(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool               e_hwc_window_display_or_commit_buffer_check(E_Hwc_Window *hwc_window, tbm_surface_h tsurface);
+
+EINTERN E_Hwc_Window_Hook      *e_hwc_window_hook_add(E_Hwc_Window_Hook_Point hookpoint, E_Hwc_Window_Hook_Cb func, const void *data);
+EINTERN void                    e_hwc_window_hook_del(E_Hwc_Window_Hook *ch);
+
+EINTERN void                    e_hwc_window_trace_debug(Eina_Bool onoff);
+EINTERN void                    e_hwc_window_commit_data_buffer_dump(E_Hwc_Window *hwc_window, E_Hwc_Window_Commit_Data *commit_data);
+EINTERN Eina_Bool               e_hwc_window_fps_get(E_Hwc_Window *hwc_window, double *fps);
+
+EINTERN void                    e_hwc_window_presentation_time_feedback_present(E_Hwc_Window *hwc_window, uint64_t sequence, uint64_t tv_sec, uint64_t tv_usec);
+EINTERN void                    e_hwc_window_presentation_time_feedback_discard(E_Hwc_Window *hwc_window);
+EINTERN void                    e_hwc_window_presentation_time_feedback_take(E_Hwc_Window *hwc_window, E_Presentation_Time_Container *container);
+
+EINTERN Eina_Bool               e_hwc_window_present_sync(E_Hwc_Window *hwc_window);
+
+EINTERN E_Hwc_Window_Update_Data *e_hwc_window_pending_update_data_dequeue(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool                 e_hwc_window_pending_update_data_enqueue(E_Hwc_Window *hwc_window, E_Hwc_Window_Update_Data *update);
+EINTERN Eina_Bool                 e_hwc_window_pending_update_data_dequeue_cancel(E_Hwc_Window *hwc_window, E_Hwc_Window_Update_Data *update);
+EINTERN Eina_Bool                 e_hwc_window_pending_update_data_has(E_Hwc_Window *hwc_window);
+
+EINTERN Eina_Bool                 e_hwc_window_presentation_callback_pending_set(E_Hwc_Window *hwc_window, E_Hwc_Presentation_Callback *callback);
+EINTERN Eina_Bool                 e_hwc_window_presentation_callback_pending_take_over(E_Hwc_Window *hwc_window, E_Hwc_Presentation_Callback_List *dst_list);
+EINTERN Eina_Bool                 e_hwc_window_presentation_callback_take(E_Hwc_Window *hwc_window, E_Hwc_Presentation_Callback_List *src_list);
+EINTERN Eina_Bool                 e_hwc_window_presentation_callback_call(E_Hwc_Window *hwc_window);
+
+EINTERN void                      e_hwc_window_below_transparent_obj_set(E_Hwc_Window *hwc_window, Eina_Bool set);
+
+#endif

diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index 57509fc..b71d2a4 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -4,6 +4,7 @@
 #include "e_comp_wl_renderer_intern.h"
 #include "e_comp_wl_tbm_intern.h"
 #include "e_pixmap_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_intern.h"
 
 # include <gbm.h>

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 5d88f1c..4390af8 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 #include "e_hwc_intern.h"
 #include "e_comp_screen_intern.h"

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 6ff6ec6..91cfe5e 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_info_shared_types.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 
 #include <time.h>

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index e4d7253..a0c1d9d 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -21,8 +21,9 @@
 #include "e_output_intern.h"
 #include "e_module_intern.h"
 #include "e_magnifier_intern.h"
-#include "e_hwc_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
+#include "e_hwc_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 191fab7..a7354d2 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -9,8 +9,9 @@
 #include "e_comp_intern.h"
 #include "e_input_intern.h"
 #include "e_error_intern.h"
-#include "e_hwc_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
+#include "e_hwc_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/video/iface/e_video_hwc_windows.c b/src/bin/video/iface/e_video_hwc_windows.c
index a80209b..f4e25a9 100644 (file)
--- a/src/bin/video/iface/e_video_hwc_windows.c
+++ b/src/bin/video/iface/e_video_hwc_windows.c
@@ -5,6 +5,7 @@
 #include "e_video_internal.h"
 #include "e_video_hwc.h"
 #include "e_comp_screen_intern.h"
+#include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 
 typedef struct _E_Video_Hwc_Windows E_Video_Hwc_Windows;