summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-28 14:24:48 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-05-07 09:53:10 +0200
commitce5ccfb5bee5174b168f0df49b75df2ab3849454 (patch)
tree9b306bbd87d30a70f20056aa44f9e90a3b593d43 /src/lib
parent71b7fc982a2e23bcb41bf6d227bceeba1f5596ec (diff)
ecore: remove the need to order the header correctly for Windows.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore/Ecore.h4
-rw-r--r--src/lib/ecore/ecore_private.h29
-rw-r--r--src/lib/ecore_audio/Ecore_Audio.h3
-rw-r--r--src/lib/ecore_avahi/Ecore_Avahi.h3
-rw-r--r--src/lib/ecore_cocoa/Ecore_Cocoa.h6
-rw-r--r--src/lib/ecore_con/Ecore_Con.h3
-rw-r--r--src/lib/ecore_drm/Ecore_Drm.h21
-rw-r--r--src/lib/ecore_drm/ecore_drm.c1
-rw-r--r--src/lib/ecore_evas/Ecore_Evas.h3
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h30
-rw-r--r--src/lib/ecore_fb/Ecore_Fb.h3
-rw-r--r--src/lib/ecore_file/Ecore_File.h3
-rw-r--r--src/lib/ecore_imf/Ecore_IMF.h3
-rw-r--r--src/lib/ecore_imf_evas/Ecore_IMF_Evas.h3
-rw-r--r--src/lib/ecore_input/Ecore_Input.h3
-rw-r--r--src/lib/ecore_input_evas/Ecore_Input_Evas.h3
-rw-r--r--src/lib/ecore_ipc/Ecore_Ipc.h5
-rw-r--r--src/lib/ecore_psl1ght/Ecore_Psl1ght.h3
-rw-r--r--src/lib/ecore_sdl/Ecore_Sdl.h3
-rw-r--r--src/lib/ecore_wayland/Ecore_Wayland.h4
-rw-r--r--src/lib/ecore_win32/Ecore_Win32.h3
-rw-r--r--src/lib/ecore_x/Ecore_X.h7
22 files changed, 133 insertions, 13 deletions
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h
index a6ac338..e843038 100644
--- a/src/lib/ecore/Ecore.h
+++ b/src/lib/ecore/Ecore.h
@@ -361,4 +361,8 @@ extern "C" {
361#ifdef __cplusplus 361#ifdef __cplusplus
362} 362}
363#endif 363#endif
364
365#undef EAPI
366#define EAPI
367
364#endif 368#endif
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index afbfeb9..89f6013 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -3,6 +3,32 @@
3 3
4#include <assert.h> 4#include <assert.h>
5 5
6#ifdef EAPI
7# undef EAPI
8#endif
9
10#ifdef _WIN32
11# ifdef EFL_ECORE_BUILD
12# ifdef DLL_EXPORT
13# define EAPI __declspec(dllexport)
14# else
15# define EAPI
16# endif /* ! DLL_EXPORT */
17# else
18# define EAPI __declspec(dllimport)
19# endif /* ! EFL_ECORE_BUILD */
20#else
21# ifdef __GNUC__
22# if __GNUC__ >= 4
23# define EAPI __attribute__ ((visibility("default")))
24# else
25# define EAPI
26# endif
27# else
28# define EAPI
29# endif
30#endif /* ! _WIN32 */
31
6extern int _ecore_log_dom; 32extern int _ecore_log_dom;
7#ifdef _ECORE_DEFAULT_LOG_DOM 33#ifdef _ECORE_DEFAULT_LOG_DOM
8# undef _ECORE_DEFAULT_LOG_DOM 34# undef _ECORE_DEFAULT_LOG_DOM
@@ -422,4 +448,7 @@ extern Eo *_ecore_parent;
422#define ECORE_PARENT_CLASS ecore_parent_class_get() 448#define ECORE_PARENT_CLASS ecore_parent_class_get()
423const Eo_Class *ecore_parent_class_get(void) EINA_CONST; 449const Eo_Class *ecore_parent_class_get(void) EINA_CONST;
424 450
451#undef EAPI
452#define EAPI
453
425#endif 454#endif
diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h
index edb9b49..ec1f85b 100644
--- a/src/lib/ecore_audio/Ecore_Audio.h
+++ b/src/lib/ecore_audio/Ecore_Audio.h
@@ -224,4 +224,7 @@ EAPI int ecore_audio_shutdown(void);
224 * @} 224 * @}
225 */ 225 */
226 226
227#undef EAPI
228#define EAPI
229
227#endif 230#endif
diff --git a/src/lib/ecore_avahi/Ecore_Avahi.h b/src/lib/ecore_avahi/Ecore_Avahi.h
index dc70b9a..1ba7443 100644
--- a/src/lib/ecore_avahi/Ecore_Avahi.h
+++ b/src/lib/ecore_avahi/Ecore_Avahi.h
@@ -85,4 +85,7 @@ EAPI const void *ecore_avahi_poll_get(Ecore_Avahi *handler); // return AvahiPol
85} 85}
86#endif 86#endif
87 87
88#undef EAPI
89#define EAPI
90
88#endif 91#endif
diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h
index 3b65001..78d15ce 100644
--- a/src/lib/ecore_cocoa/Ecore_Cocoa.h
+++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h
@@ -159,15 +159,17 @@ EAPI void ecore_cocoa_window_borderless_set(Ecore_Cocoa_Window *window,
159 int on); 159 int on);
160 160
161EAPI void ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window, 161EAPI void ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window,
162 void *view); 162 void *view);
163 163
164EAPI int ecore_cocoa_titlebar_height_get(void); 164EAPI int ecore_cocoa_titlebar_height_get(void);
165 165
166EAPI Ecore_Cocoa_Window_Id ecore_cocoa_window_get_window_id(Ecore_Cocoa_Window *window); 166EAPI Ecore_Cocoa_Window_Id ecore_cocoa_window_get_window_id(Ecore_Cocoa_Window *window);
167 167
168
169#ifdef __cplusplus 168#ifdef __cplusplus
170} 169}
171#endif 170#endif
172 171
172#undef EAPI
173#define EAPI
174
173#endif 175#endif
diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h
index 0544858..bf10fad 100644
--- a/src/lib/ecore_con/Ecore_Con.h
+++ b/src/lib/ecore_con/Ecore_Con.h
@@ -2227,4 +2227,7 @@ EAPI int ecore_con_url_status_code_get(Ecore_Con_Url *url_con);
2227} 2227}
2228#endif 2228#endif
2229 2229
2230#undef EAPI
2231#define EAPI
2232
2230#endif 2233#endif
diff --git a/src/lib/ecore_drm/Ecore_Drm.h b/src/lib/ecore_drm/Ecore_Drm.h
index 302af38..feb48f8 100644
--- a/src/lib/ecore_drm/Ecore_Drm.h
+++ b/src/lib/ecore_drm/Ecore_Drm.h
@@ -1,6 +1,12 @@
1#ifndef _ECORE_DRM_H 1#ifndef _ECORE_DRM_H
2# define _ECORE_DRM_H 2# define _ECORE_DRM_H
3 3
4# include <xf86drm.h>
5# include <xf86drmMode.h>
6# include <drm_fourcc.h>
7# include <Ecore.h>
8# include <Eeze.h>
9
4# ifdef EAPI 10# ifdef EAPI
5# undef EAPI 11# undef EAPI
6# endif 12# endif
@@ -23,11 +29,9 @@
23# endif // ifdef __GNUC__ 29# endif // ifdef __GNUC__
24# endif // ifdef _MSC_VER 30# endif // ifdef _MSC_VER
25 31
26# include <xf86drm.h> 32#ifdef __cplusplus
27# include <xf86drmMode.h> 33extern "C" {
28# include <drm_fourcc.h> 34#endif
29# include <Ecore.h>
30# include <Eeze.h>
31 35
32typedef enum _Ecore_Drm_Evdev_Capabilities 36typedef enum _Ecore_Drm_Evdev_Capabilities
33{ 37{
@@ -757,4 +761,11 @@ EAPI void ecore_drm_device_pointer_xy_get(Ecore_Drm_Device *dev, int *x, int *y)
757 */ 761 */
758EAPI const Eina_List *ecore_drm_devices_get(void); 762EAPI const Eina_List *ecore_drm_devices_get(void);
759 763
764#ifdef __cplusplus
765}
766#endif
767
768#undef EAPI
769#define EAPI
770
760#endif 771#endif
diff --git a/src/lib/ecore_drm/ecore_drm.c b/src/lib/ecore_drm/ecore_drm.c
index c2dbfb0..6bbbde0 100644
--- a/src/lib/ecore_drm/ecore_drm.c
+++ b/src/lib/ecore_drm/ecore_drm.c
@@ -2,7 +2,6 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#include "Ecore_Drm.h"
6#include "ecore_drm_private.h" 5#include "ecore_drm_private.h"
7 6
8/* local variables */ 7/* local variables */
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 9fb5923..464c470 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -2797,4 +2797,7 @@ EAPI int ecore_evas_pixmap_depth_get(const Ecore_Evas *ee);
2797} 2797}
2798#endif 2798#endif
2799 2799
2800#undef EAPI
2801#define EAPI
2802
2800#endif 2803#endif
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index dc11228..82e2620 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -1,6 +1,32 @@
1#ifndef _ECORE_EVAS_PRIVATE_H 1#ifndef _ECORE_EVAS_PRIVATE_H
2#define _ECORE_EVAS_PRIVATE_H 2#define _ECORE_EVAS_PRIVATE_H
3 3
4#ifdef EAPI
5# undef EAPI
6#endif
7
8#ifdef _WIN32
9# ifdef EFL_ECORE_EVAS_BUILD
10# ifdef DLL_EXPORT
11# define EAPI __declspec(dllexport)
12# else
13# define EAPI
14# endif /* ! DLL_EXPORT */
15# else
16# define EAPI __declspec(dllimport)
17# endif /* ! EFL_ECORE_EVAS_BUILD */
18#else
19# ifdef __GNUC__
20# if __GNUC__ >= 4
21# define EAPI __attribute__ ((visibility("default")))
22# else
23# define EAPI
24# endif
25# else
26# define EAPI
27# endif
28#endif /* ! _WIN32 */
29
4#define ECORE_MAGIC_EVAS 0x76543211 30#define ECORE_MAGIC_EVAS 0x76543211
5 31
6/** Log domain macros and variables **/ 32/** Log domain macros and variables **/
@@ -392,5 +418,7 @@ const Eina_List *_ecore_evas_available_engines_get(void);
392void _ecore_evas_engine_init(void); 418void _ecore_evas_engine_init(void);
393void _ecore_evas_engine_shutdown(void); 419void _ecore_evas_engine_shutdown(void);
394 420
395#endif 421#undef EAPI
422#define EAPI
396 423
424#endif
diff --git a/src/lib/ecore_fb/Ecore_Fb.h b/src/lib/ecore_fb/Ecore_Fb.h
index 69d37a4..5a898f2 100644
--- a/src/lib/ecore_fb/Ecore_Fb.h
+++ b/src/lib/ecore_fb/Ecore_Fb.h
@@ -98,4 +98,7 @@ EAPI void ecore_fb_touch_screen_calibrate_get(int *xscale,
98} 98}
99#endif 99#endif
100 100
101#undef EAPI
102#define EAPI
103
101#endif 104#endif
diff --git a/src/lib/ecore_file/Ecore_File.h b/src/lib/ecore_file/Ecore_File.h
index 806ad87..c78b0b1 100644
--- a/src/lib/ecore_file/Ecore_File.h
+++ b/src/lib/ecore_file/Ecore_File.h
@@ -187,4 +187,7 @@ EAPI Eina_Bool ecore_file_download_protocol_available(const char *protocol);
187} 187}
188#endif 188#endif
189 189
190#undef EAPI
191#define EAPI
192
190#endif 193#endif
diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h
index c860d0b..5e9766c 100644
--- a/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@@ -1871,4 +1871,7 @@ EAPI Ecore_IMF_BiDi_Direction ecore_imf_context_bidi_direction_get(Ecore_IM
1871} 1871}
1872#endif 1872#endif
1873 1873
1874#undef EAPI
1875#define EAPI
1876
1874#endif 1877#endif
diff --git a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
index 84794c2..61005be 100644
--- a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
+++ b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h
@@ -165,4 +165,7 @@ EAPI void ecore_imf_evas_event_key_up_wrap(Evas_Event_Key_Up *evas_event, Ecore_
165} 165}
166#endif 166#endif
167 167
168#undef EAPI
169#define EAPI
170
168#endif 171#endif
diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h
index b9723c8..f58c56e 100644
--- a/src/lib/ecore_input/Ecore_Input.h
+++ b/src/lib/ecore_input/Ecore_Input.h
@@ -358,5 +358,8 @@ extern "C" {
358} 358}
359#endif 359#endif
360 360
361#undef EAPI
362#define EAPI
363
361/** @} */ 364/** @} */
362#endif 365#endif
diff --git a/src/lib/ecore_input_evas/Ecore_Input_Evas.h b/src/lib/ecore_input_evas/Ecore_Input_Evas.h
index 9116107..2296048 100644
--- a/src/lib/ecore_input_evas/Ecore_Input_Evas.h
+++ b/src/lib/ecore_input_evas/Ecore_Input_Evas.h
@@ -62,4 +62,7 @@ EAPI void ecore_event_evas_modifier_lock_update(Evas *e, unsigned int modif
62} 62}
63#endif 63#endif
64 64
65#undef EAPI
66#define EAPI
67
65#endif 68#endif
diff --git a/src/lib/ecore_ipc/Ecore_Ipc.h b/src/lib/ecore_ipc/Ecore_Ipc.h
index a3e3871..301ea24 100644
--- a/src/lib/ecore_ipc/Ecore_Ipc.h
+++ b/src/lib/ecore_ipc/Ecore_Ipc.h
@@ -359,11 +359,14 @@ EAPI void ecore_ipc_client_flush(Ecore_Ipc_Client *cl);
359EAPI int ecore_ipc_ssl_available_get(void); 359EAPI int ecore_ipc_ssl_available_get(void);
360/* FIXME: need to add a callback to "ok" large ipc messages greater than */ 360/* FIXME: need to add a callback to "ok" large ipc messages greater than */
361/* a certain size (security/DOS attack safety) */ 361/* a certain size (security/DOS attack safety) */
362 362
363#ifdef __cplusplus 363#ifdef __cplusplus
364} 364}
365#endif 365#endif
366 366
367#undef EAPI
368#define EAPI
369
367/** 370/**
368 * @} 371 * @}
369 */ 372 */
diff --git a/src/lib/ecore_psl1ght/Ecore_Psl1ght.h b/src/lib/ecore_psl1ght/Ecore_Psl1ght.h
index c6300fd..2eaca29 100644
--- a/src/lib/ecore_psl1ght/Ecore_Psl1ght.h
+++ b/src/lib/ecore_psl1ght/Ecore_Psl1ght.h
@@ -118,4 +118,7 @@ EAPI void ecore_psl1ght_optimal_screen_resolution_get(int *w, int *h);
118} 118}
119#endif 119#endif
120 120
121#undef EAPI
122#define EAPI
123
121#endif 124#endif
diff --git a/src/lib/ecore_sdl/Ecore_Sdl.h b/src/lib/ecore_sdl/Ecore_Sdl.h
index ed4bd0f..36b69a4 100644
--- a/src/lib/ecore_sdl/Ecore_Sdl.h
+++ b/src/lib/ecore_sdl/Ecore_Sdl.h
@@ -120,4 +120,7 @@ struct _Ecore_Sdl_Event_Mouse_Wheel /** SDL Mouse Wheel event */
120} 120}
121#endif 121#endif
122 122
123#undef EAPI
124#define EAPI
125
123#endif 126#endif
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index dd1260e..1735014 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -964,8 +964,12 @@ EAPI void ecore_wl_subsurf_sync_set(Ecore_Wl_Subsurf *ess, Eina_Bool val);
964 * @since 1.8 964 * @since 1.8
965 */ 965 */
966EAPI void ecore_wl_subsurf_opaque_region_set(Ecore_Wl_Subsurf *ess, int x, int y, int w, int h); 966EAPI void ecore_wl_subsurf_opaque_region_set(Ecore_Wl_Subsurf *ess, int x, int y, int w, int h);
967
967#ifdef __cplusplus 968#ifdef __cplusplus
968} 969}
969#endif 970#endif
970 971
972#undef EAPI
973#define EAPI
974
971#endif 975#endif
diff --git a/src/lib/ecore_win32/Ecore_Win32.h b/src/lib/ecore_win32/Ecore_Win32.h
index ba0cc4d..154ede8 100644
--- a/src/lib/ecore_win32/Ecore_Win32.h
+++ b/src/lib/ecore_win32/Ecore_Win32.h
@@ -520,10 +520,11 @@ EAPI void ecore_win32_dnd_unregister_drop_target(Ecore_Win32_Window *window
520 * @} 520 * @}
521 */ 521 */
522 522
523
524#ifdef __cplusplus 523#ifdef __cplusplus
525} 524}
526#endif 525#endif
527 526
527#undef EAPI
528#define EAPI
528 529
529#endif /* __ECORE_WIN32_H__ */ 530#endif /* __ECORE_WIN32_H__ */
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index b72957d..a6c7d80 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2708,11 +2708,14 @@ EAPI void ecore_x_e_window_rotation_change_prep
2708EAPI void ecore_x_e_window_rotation_change_request_send(Ecore_X_Window win, int rot); /**< @since 1.9 */ 2708EAPI void ecore_x_e_window_rotation_change_request_send(Ecore_X_Window win, int rot); /**< @since 1.9 */
2709EAPI void ecore_x_e_window_rotation_change_done_send(Ecore_X_Window root, Ecore_X_Window win, int rot, int w, int h); /**< @since 1.9 */ 2709EAPI void ecore_x_e_window_rotation_change_done_send(Ecore_X_Window root, Ecore_X_Window win, int rot, int w, int h); /**< @since 1.9 */
2710 2710
2711#include <Ecore_X_Atoms.h>
2712#include <Ecore_X_Cursor.h>
2713
2711#ifdef __cplusplus 2714#ifdef __cplusplus
2712} 2715}
2713#endif // ifdef __cplusplus 2716#endif // ifdef __cplusplus
2714 2717
2715#include <Ecore_X_Atoms.h> 2718#undef EAPI
2716#include <Ecore_X_Cursor.h> 2719#define EAPI
2717 2720
2718#endif // ifndef _ECORE_X_H 2721#endif // ifndef _ECORE_X_H