summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-05-22 15:05:16 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-05-22 15:05:16 +0900
commitc8ec1cb2af4f3771ebdcafff3a1f9c7db5c13dad (patch)
tree27741ff35222106b1e2cc1bcc7e1cf3d078ff6cf /src
parent1e2d382298b0d4357d35b1f350c04f04820c7218 (diff)
Revert "evas: Fix build for Windows (hopefully)"
This reverts commit 1e2d382298b0d4357d35b1f350c04f04820c7218. This segfaults. Ouch... Will need more time to fix this.
Diffstat (limited to '')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c1
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h32
-rw-r--r--src/lib/evas/Evas_Internal.h3
-rw-r--r--src/lib/evas/canvas/efl_input_focus.c2
4 files changed, 32 insertions, 6 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index c7942548e8..ce41475d19 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -28,7 +28,6 @@
28#include "ecore_private.h" 28#include "ecore_private.h"
29#include <Ecore_Input.h> 29#include <Ecore_Input.h>
30#include <Ecore_Input_Evas.h> 30#include <Ecore_Input_Evas.h>
31#include <Evas_Internal.h>
32 31
33#include "Ecore_Evas.h" 32#include "Ecore_Evas.h"
34#include "ecore_evas_private.h" 33#include "ecore_evas_private.h"
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index 86884bf36b..e684423563 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -167,4 +167,36 @@ _efl_input_value_mark(Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
167 167
168#define _efl_input_value_mask(key) (1u << (int) key) 168#define _efl_input_value_mask(key) (1u << (int) key)
169 169
170/* Internal EO APIs */
171
172#undef EAPI
173
174#ifdef _WIN32
175# ifdef EFL_EFL_BUILD
176# ifdef DLL_EXPORT
177# define EAPI __declspec(dllexport)
178# else
179# define EAPI
180# endif /* ! DLL_EXPORT */
181# else
182# define EAPI __declspec(dllimport)
183# endif /* ! EFL_EFL_BUILD */
184#else
185# ifdef __GNUC__
186# if __GNUC__ >= 4
187# define EAPI __attribute__ ((visibility("default")))
188# else
189# define EAPI
190# endif
191# else
192# define EAPI
193# endif
194#endif /* ! _WIN32 */
195
196EOAPI void *efl_input_legacy_info_get(const Eo *obj);
197EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv);
198
199#undef EAPI
200#define EAPI
201
170#endif 202#endif
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 47aeb0e55d..be30998312 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -53,9 +53,6 @@ EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
53EOAPI void efl_canvas_group_add(Eo *obj); 53EOAPI void efl_canvas_group_add(Eo *obj);
54EOAPI void efl_canvas_group_del(Eo *obj); 54EOAPI void efl_canvas_group_del(Eo *obj);
55 55
56EOAPI void *efl_input_legacy_info_get(const Eo *obj);
57EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv);
58
59EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE; 56EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE;
60#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE)) 57#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE))
61 58
diff --git a/src/lib/evas/canvas/efl_input_focus.c b/src/lib/evas/canvas/efl_input_focus.c
index 5e3065b489..4ee891a1e0 100644
--- a/src/lib/evas/canvas/efl_input_focus.c
+++ b/src/lib/evas/canvas/efl_input_focus.c
@@ -6,8 +6,6 @@
6 6
7#include <Evas.h> 7#include <Evas.h>
8 8
9#include <Evas_Internal.h>
10
11#define EFL_INTERNAL_UNSTABLE 9#define EFL_INTERNAL_UNSTABLE
12#include "interfaces/efl_common_internal.h" 10#include "interfaces/efl_common_internal.h"
13 11