headers: fix build errors

Change-Id: I3e109581c907489eb6ed92fb1f83f5506012361f

diff --git a/src/bin/e_input_inputs.c b/src/bin/e_input_inputs.c
index f22f200..4d742ec 100644 (file)
--- a/src/bin/e_input_inputs.c
+++ b/src/bin/e_input_inputs.c
@@ -5,6 +5,7 @@
 #include "e_keyrouter_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_config_intern.h"
+#include "e_device_intern.h"
 
 #include <glib.h>
 

diff --git a/src/bin/e_keyrouter.c b/src/bin/e_keyrouter.c
index 5fb34d6..a8a55b8 100644 (file)
--- a/src/bin/e_keyrouter.c
+++ b/src/bin/e_keyrouter.c
@@ -5,6 +5,7 @@
 #include "e_comp_wl_intern.h"
 #include "e_info_server_intern.h"
 
+#include <tizen-extension-server-protocol.h>
 #include <glib.h>
 
 static int _e_keyrouter_intercept_hooks_delete = 0;

diff --git a/src/bin/e_keyrouter_events.c b/src/bin/e_keyrouter_events.c
index b73bdcb..0e2a6d8 100644 (file)
--- a/src/bin/e_keyrouter_events.c
+++ b/src/bin/e_keyrouter_events.c
@@ -6,6 +6,8 @@
 #include "e_screensaver_intern.h"
 #include "e_config_intern.h"
 
+#include <tizen-extension-server-protocol.h>
+
 static void _e_keyrouter_send_key_events(int type, Ecore_Event_Key *ev, E_Device *dev);
 static void _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev);
 static void _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev, E_Device *dev);

diff --git a/src/bin/e_keyrouter_list.c b/src/bin/e_keyrouter_list.c
index be01265..cf928f4 100644 (file)
--- a/src/bin/e_keyrouter_list.c
+++ b/src/bin/e_keyrouter_list.c
@@ -1,5 +1,7 @@
 #include "e_keyrouter_intern.h"
 
+#include <tizen-extension-server-protocol.h>
+
 static int _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_client *wc, uint32_t key, uint32_t mode);
 static Eina_Bool _e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc, int key, int mode);
 static Eina_List **_e_keyrouter_get_list(int mode, int key);

diff --git a/src/bin/e_keyrouter_wl.c b/src/bin/e_keyrouter_wl.c
index f823226..26f5786 100644 (file)
--- a/src/bin/e_keyrouter_wl.c
+++ b/src/bin/e_keyrouter_wl.c
@@ -5,6 +5,8 @@
 #include "e_client_intern.h"
 #include "e_config_intern.h"
 
+#include <tizen-extension-server-protocol.h>
+
 void
 e_keyrouter_wl_event_surface_send(struct wl_resource *surface, int key, int mode)
 {

diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index dfa5639..83319dc 100644 (file)
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -1,4 +1,5 @@
 #include "e_error_intern.h"
+#include "e_utils.h"
 
 /* yes - i know. glibc specific... but i like being able to do my own */
 /* backtraces! NB: you need CFLAGS="-rdynamic -g" LDFLAGS="-rdynamic -g" */

diff --git a/src/include/e.h b/src/include/e.h
index 6b901f9..ef3a166 100644 (file)
--- a/src/include/e.h
+++ b/src/include/e.h
@@ -16,13 +16,6 @@
 #  include "config.h"
 # endif
 
-# define USE_IPC
-# if 0
-#  define OBJECT_PARANOIA_CHECK
-# endif
-# define OBJECT_CHECK
-# define OBJECT_HASH_CHECK
-
 # ifndef _FILE_OFFSET_BITS
 #  define _FILE_OFFSET_BITS 64
 # endif

diff --git a/src/include/e_comp.h b/src/include/e_comp.h
index f92e36c..bf6c15e 100644 (file)
--- a/src/include/e_comp.h
+++ b/src/include/e_comp.h
@@ -11,7 +11,12 @@
 #include <e_desk.h>
 #include <e_desk_area.h>
 
+#ifdef __cplusplus
+#include <atomic>
+using namespace std;
+#else
 #include <stdatomic.h>
+#endif
 #include <glib.h>
 #include <Ecore.h>
 #include <wayland-server.h>

diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h
index 2af8bd7..c09212f 100644 (file)
--- a/src/include/e_comp_wl.h
+++ b/src/include/e_comp_wl.h
@@ -10,7 +10,12 @@
 #include <e_devicemgr.h>
 #include <e_util_transform.h>
 
+#ifdef __cplusplus
+#include <atomic>
+using namespace std;
+#else
 #include <stdatomic.h>
+#endif
 #include <tbm_surface.h>
 #include <glib.h>
 #include <Evas.h>

diff --git a/src/include/e_keyrouter.h b/src/include/e_keyrouter.h
index 66ec713..4cdde7c 100644 (file)
--- a/src/include/e_keyrouter.h
+++ b/src/include/e_keyrouter.h
@@ -1,7 +1,7 @@
 #ifndef E_KEYROUTER_H
 #define E_KEYROUTER_H
 
-#include <e_device_intern.h>
+#include <e_device.h>
 #include <e_input_event.h>
 #include <e_config_data.h>
 
@@ -9,7 +9,6 @@
 #include <Ecore_Input.h>
 
 #include <wayland-server.h>
-#include <tizen-extension-server-protocol.h>
 
 #ifdef HAVE_CYNARA
 #include <cynara-client.h>

diff --git a/src/include/e_types.h b/src/include/e_types.h
index d322d39..1459b93 100644 (file)
--- a/src/include/e_types.h
+++ b/src/include/e_types.h
@@ -44,6 +44,13 @@
 #  define EINTERN
 # endif
 
+# define USE_IPC
+# if 0
+#  define OBJECT_PARANOIA_CHECK
+# endif
+# define OBJECT_CHECK
+# define OBJECT_HASH_CHECK
+
 # define E_LAYER_COUNT 31
 
 //#define SMARTERR(args...) abort()