diff options
author | Vincent Torri <vincent.torri@gmail.com> | 2018-01-18 18:04:03 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2018-01-18 18:04:03 +0900 |
commit | f5b01ac5ce3d86c3bcd89c4882a77b1c126ca789 (patch) | |
tree | cb39aad3598224652d3117f64328d596678ffdc6 | |
parent | 8a1655a15cb3863165a7dddaa6021953ce9c18ab (diff) |
all: Simplify definition of EAPI
This will help in the transition from Autotools to Meson. This has been
tested on Windows for which EFL_XXX_BUILD were first introduced.
84 files changed, 345 insertions, 337 deletions
@@ -427,7 +427,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS} | |||
427 | m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" | 427 | m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" |
428 | USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" | 428 | USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" |
429 | USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la" | 429 | USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la" |
430 | m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1" | 430 | m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_BUILD=1" |
431 | requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}" | 431 | requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}" |
432 | requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}" | 432 | requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}" |
433 | 433 | ||
diff --git a/src/benchmarks/eina/Ecore_Data.h b/src/benchmarks/eina/Ecore_Data.h index e2ea607d16..6641eff267 100644 --- a/src/benchmarks/eina/Ecore_Data.h +++ b/src/benchmarks/eina/Ecore_Data.h | |||
@@ -10,15 +10,15 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_ECORE_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
17 | # define EAPI | 17 | # define EAPI |
18 | # endif /* ! DLL_EXPORT */ | 18 | # endif |
19 | # else | 19 | # else |
20 | # define EAPI __declspec(dllimport) | 20 | # define EAPI __declspec(dllimport) |
21 | # endif /* ! EFL_ECORE_BUILD */ | 21 | # endif |
22 | #else | 22 | #else |
23 | # ifdef __GNUC__ | 23 | # ifdef __GNUC__ |
24 | # if __GNUC__ >= 4 | 24 | # if __GNUC__ >= 4 |
@@ -29,7 +29,7 @@ | |||
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif | 31 | # endif |
32 | #endif /* ! _WIN32 */ | 32 | #endif |
33 | 33 | ||
34 | /** | 34 | /** |
35 | * @file Ecore_Data.h | 35 | * @file Ecore_Data.h |
diff --git a/src/benchmarks/eina/Evas_Data.h b/src/benchmarks/eina/Evas_Data.h index 97848927b0..2c07402b65 100644 --- a/src/benchmarks/eina/Evas_Data.h +++ b/src/benchmarks/eina/Evas_Data.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_EVAS_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_EVAS_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -25,7 +25,7 @@ | |||
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif | 27 | # endif |
28 | #endif /* ! _WIN32 */ | 28 | #endif |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * @file | 31 | * @file |
diff --git a/src/bindings/js/ecore_js/Ecore_Js.hh b/src/bindings/js/ecore_js/Ecore_Js.hh index 15331aa93e..35b33a71eb 100644 --- a/src/bindings/js/ecore_js/Ecore_Js.hh +++ b/src/bindings/js/ecore_js/Ecore_Js.hh | |||
@@ -12,15 +12,15 @@ | |||
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #ifdef _WIN32 | 14 | #ifdef _WIN32 |
15 | # ifdef EFL_ECORE_JS_BUILD | 15 | # ifdef EFL_BUILD |
16 | # ifdef DLL_EXPORT | 16 | # ifdef DLL_EXPORT |
17 | # define EAPI __declspec(dllexport) | 17 | # define EAPI __declspec(dllexport) |
18 | # else | 18 | # else |
19 | # define EAPI | 19 | # define EAPI |
20 | # endif /* ! DLL_EXPORT */ | 20 | # endif |
21 | # else | 21 | # else |
22 | # define EAPI __declspec(dllimport) | 22 | # define EAPI __declspec(dllimport) |
23 | # endif /* ! EFL_ECORE_BUILD */ | 23 | # endif |
24 | #else | 24 | #else |
25 | # ifdef __GNUC__ | 25 | # ifdef __GNUC__ |
26 | # if __GNUC__ >= 4 | 26 | # if __GNUC__ >= 4 |
@@ -31,7 +31,7 @@ | |||
31 | # else | 31 | # else |
32 | # define EAPI | 32 | # define EAPI |
33 | # endif | 33 | # endif |
34 | #endif /* ! _WIN32 */ | 34 | #endif |
35 | 35 | ||
36 | namespace efl { namespace ecore { namespace js { | 36 | namespace efl { namespace ecore { namespace js { |
37 | 37 | ||
@@ -55,4 +55,7 @@ EAPI void register_ecore(v8::Isolate *isolate,v8::Handle<v8::Object> exports); | |||
55 | 55 | ||
56 | } } } | 56 | } } } |
57 | 57 | ||
58 | #undef EAPI | ||
59 | #define EAPI | ||
60 | |||
58 | #endif | 61 | #endif |
diff --git a/src/bindings/js/eina_js/Eina_Js.hh b/src/bindings/js/eina_js/Eina_Js.hh index b193b5461c..f65adf82bc 100644 --- a/src/bindings/js/eina_js/Eina_Js.hh +++ b/src/bindings/js/eina_js/Eina_Js.hh | |||
@@ -10,15 +10,15 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_EINA_JS_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
17 | # define EAPI | 17 | # define EAPI |
18 | # endif /* ! DLL_EXPORT */ | 18 | # endif |
19 | # else | 19 | # else |
20 | # define EAPI __declspec(dllimport) | 20 | # define EAPI __declspec(dllimport) |
21 | # endif /* ! EFL_ECORE_BUILD */ | 21 | # endif |
22 | #else | 22 | #else |
23 | # ifdef __GNUC__ | 23 | # ifdef __GNUC__ |
24 | # if __GNUC__ >= 4 | 24 | # if __GNUC__ >= 4 |
@@ -29,7 +29,7 @@ | |||
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif | 31 | # endif |
32 | #endif /* ! _WIN32 */ | 32 | #endif |
33 | 33 | ||
34 | #include <eina_js_container.hh> | 34 | #include <eina_js_container.hh> |
35 | #include <eina_js_accessor.hh> | 35 | #include <eina_js_accessor.hh> |
diff --git a/src/bindings/js/eldbus_js/Eldbus_Js.hh b/src/bindings/js/eldbus_js/Eldbus_Js.hh index 00da9ca924..3f2e07247b 100644 --- a/src/bindings/js/eldbus_js/Eldbus_Js.hh +++ b/src/bindings/js/eldbus_js/Eldbus_Js.hh | |||
@@ -12,15 +12,15 @@ | |||
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #ifdef _WIN32 | 14 | #ifdef _WIN32 |
15 | # ifdef EFL_EINA_JS_BUILD | 15 | # ifdef EFL_BUILD |
16 | # ifdef DLL_EXPORT | 16 | # ifdef DLL_EXPORT |
17 | # define EAPI __declspec(dllexport) | 17 | # define EAPI __declspec(dllexport) |
18 | # else | 18 | # else |
19 | # define EAPI | 19 | # define EAPI |
20 | # endif /* ! DLL_EXPORT */ | 20 | # endif |
21 | # else | 21 | # else |
22 | # define EAPI __declspec(dllimport) | 22 | # define EAPI __declspec(dllimport) |
23 | # endif /* ! EFL_ECORE_BUILD */ | 23 | # endif |
24 | #else | 24 | #else |
25 | # ifdef __GNUC__ | 25 | # ifdef __GNUC__ |
26 | # if __GNUC__ >= 4 | 26 | # if __GNUC__ >= 4 |
@@ -31,7 +31,7 @@ | |||
31 | # else | 31 | # else |
32 | # define EAPI | 32 | # define EAPI |
33 | # endif | 33 | # endif |
34 | #endif /* ! _WIN32 */ | 34 | #endif |
35 | 35 | ||
36 | namespace efl { namespace eldbus { namespace js { | 36 | namespace efl { namespace eldbus { namespace js { |
37 | 37 | ||
@@ -40,9 +40,12 @@ EAPI void register_eldbus_core(v8::Isolate* isolate, v8::Handle<v8::Object> expo | |||
40 | EAPI void register_eldbus_message(v8::Isolate* isolate, v8::Handle<v8::Object> exports); | 40 | EAPI void register_eldbus_message(v8::Isolate* isolate, v8::Handle<v8::Object> exports); |
41 | EAPI void register_eldbus_object_mapper(v8::Isolate* isolate, v8::Handle<v8::Object> exports); | 41 | EAPI void register_eldbus_object_mapper(v8::Isolate* isolate, v8::Handle<v8::Object> exports); |
42 | EAPI void register_eldbus(v8::Isolate* isolate, v8::Handle<v8::Object> exports); | 42 | EAPI void register_eldbus(v8::Isolate* isolate, v8::Handle<v8::Object> exports); |
43 | 43 | ||
44 | } } } | 44 | } } } |
45 | 45 | ||
46 | #undef EAPI | ||
47 | #define EAPI | ||
48 | |||
46 | #include <eldbus_js_util.hh> | 49 | #include <eldbus_js_util.hh> |
47 | 50 | ||
48 | #endif | 51 | #endif |
diff --git a/src/examples/efl_mono/example_numberwrapper.c b/src/examples/efl_mono/example_numberwrapper.c index 4ec0f72df1..27bc3f36a6 100644 --- a/src/examples/efl_mono/example_numberwrapper.c +++ b/src/examples/efl_mono/example_numberwrapper.c | |||
@@ -10,15 +10,15 @@ | |||
10 | #define EOAPI EAPI EAPI_WEAK | 10 | #define EOAPI EAPI EAPI_WEAK |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_EO_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
17 | # define EAPI | 17 | # define EAPI |
18 | # endif /* ! DLL_EXPORT */ | 18 | # endif |
19 | # else | 19 | # else |
20 | # define EAPI __declspec(dllimport) | 20 | # define EAPI __declspec(dllimport) |
21 | # endif /* ! EFL_EO_BUILD */ | 21 | # endif |
22 | #else | 22 | #else |
23 | # ifdef __GNUC__ | 23 | # ifdef __GNUC__ |
24 | # if __GNUC__ >= 4 | 24 | # if __GNUC__ >= 4 |
@@ -29,7 +29,7 @@ | |||
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif | 31 | # endif |
32 | #endif /* ! _WIN32 */ | 32 | #endif |
33 | 33 | ||
34 | #include "example_numberwrapper.eo.h" | 34 | #include "example_numberwrapper.eo.h" |
35 | 35 | ||
diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h index 7b8d04e311..e31252a380 100644 --- a/src/lib/ecore/Ecore.h +++ b/src/lib/ecore/Ecore.h | |||
@@ -281,15 +281,15 @@ | |||
281 | #endif | 281 | #endif |
282 | 282 | ||
283 | #ifdef _WIN32 | 283 | #ifdef _WIN32 |
284 | # ifdef EFL_ECORE_BUILD | 284 | # ifdef EFL_BUILD |
285 | # ifdef DLL_EXPORT | 285 | # ifdef DLL_EXPORT |
286 | # define EAPI __declspec(dllexport) | 286 | # define EAPI __declspec(dllexport) |
287 | # else | 287 | # else |
288 | # define EAPI | 288 | # define EAPI |
289 | # endif /* ! DLL_EXPORT */ | 289 | # endif |
290 | # else | 290 | # else |
291 | # define EAPI __declspec(dllimport) | 291 | # define EAPI __declspec(dllimport) |
292 | # endif /* ! EFL_ECORE_BUILD */ | 292 | # endif |
293 | #else | 293 | #else |
294 | # ifdef __GNUC__ | 294 | # ifdef __GNUC__ |
295 | # if __GNUC__ >= 4 | 295 | # if __GNUC__ >= 4 |
@@ -300,7 +300,7 @@ | |||
300 | # else | 300 | # else |
301 | # define EAPI | 301 | # define EAPI |
302 | # endif | 302 | # endif |
303 | #endif /* ! _WIN32 */ | 303 | #endif |
304 | 304 | ||
305 | #ifdef _WIN32 | 305 | #ifdef _WIN32 |
306 | # define WIN32_LEAN_AND_MEAN | 306 | # define WIN32_LEAN_AND_MEAN |
diff --git a/src/lib/ecore/Ecore_Getopt.h b/src/lib/ecore/Ecore_Getopt.h index e09a2bef2d..a4f188c8c2 100644 --- a/src/lib/ecore/Ecore_Getopt.h +++ b/src/lib/ecore/Ecore_Getopt.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_ECORE_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_ECORE_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | /** | 33 | /** |
34 | * @ingroup Ecore | 34 | * @ingroup Ecore |
diff --git a/src/lib/ecore/Efl_Core.h b/src/lib/ecore/Efl_Core.h index f1fa1a4d0b..92ff448cae 100644 --- a/src/lib/ecore/Efl_Core.h +++ b/src/lib/ecore/Efl_Core.h | |||
@@ -16,15 +16,15 @@ | |||
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | #ifdef _WIN32 | 18 | #ifdef _WIN32 |
19 | # ifdef EFL_ECORE_BUILD | 19 | # ifdef EFL_BUILD |
20 | # ifdef DLL_EXPORT | 20 | # ifdef DLL_EXPORT |
21 | # define EAPI __declspec(dllexport) | 21 | # define EAPI __declspec(dllexport) |
22 | # else | 22 | # else |
23 | # define EAPI | 23 | # define EAPI |
24 | # endif /* ! DLL_EXPORT */ | 24 | # endif |
25 | # else | 25 | # else |
26 | # define EAPI __declspec(dllimport) | 26 | # define EAPI __declspec(dllimport) |
27 | # endif /* ! EFL_ECORE_BUILD */ | 27 | # endif |
28 | #else | 28 | #else |
29 | # ifdef __GNUC__ | 29 | # ifdef __GNUC__ |
30 | # if __GNUC__ >= 4 | 30 | # if __GNUC__ >= 4 |
@@ -35,7 +35,7 @@ | |||
35 | # else | 35 | # else |
36 | # define EAPI | 36 | # define EAPI |
37 | # endif | 37 | # endif |
38 | #endif /* ! _WIN32 */ | 38 | #endif |
39 | 39 | ||
40 | #ifdef _WIN32 | 40 | #ifdef _WIN32 |
41 | # define WIN32_LEAN_AND_MEAN | 41 | # define WIN32_LEAN_AND_MEAN |
diff --git a/src/lib/ecore/ecore_internal.h b/src/lib/ecore/ecore_internal.h index 3b60063728..f3380cc35f 100644 --- a/src/lib/ecore/ecore_internal.h +++ b/src/lib/ecore/ecore_internal.h | |||
@@ -7,15 +7,15 @@ | |||
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | #ifdef _WIN32 | 9 | #ifdef _WIN32 |
10 | # ifdef EFL_ECORE_BUILD | 10 | # ifdef EFL_BUILD |
11 | # ifdef DLL_EXPORT | 11 | # ifdef DLL_EXPORT |
12 | # define EAPI __declspec(dllexport) | 12 | # define EAPI __declspec(dllexport) |
13 | # else | 13 | # else |
14 | # define EAPI | 14 | # define EAPI |
15 | # endif /* ! DLL_EXPORT */ | 15 | # endif |
16 | # else | 16 | # else |
17 | # define EAPI __declspec(dllimport) | 17 | # define EAPI __declspec(dllimport) |
18 | # endif /* ! EFL_ECORE_BUILD */ | 18 | # endif |
19 | #else | 19 | #else |
20 | # ifdef __GNUC__ | 20 | # ifdef __GNUC__ |
21 | # if __GNUC__ >= 4 | 21 | # if __GNUC__ >= 4 |
@@ -26,7 +26,7 @@ | |||
26 | # else | 26 | # else |
27 | # define EAPI | 27 | # define EAPI |
28 | # endif | 28 | # endif |
29 | #endif /* ! _WIN32 */ | 29 | #endif |
30 | 30 | ||
31 | EAPI void ecore_loop_arguments_send(int argc, const char **argv); | 31 | EAPI void ecore_loop_arguments_send(int argc, const char **argv); |
32 | 32 | ||
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h index 3854a43b1b..02e9bce8c0 100644 --- a/src/lib/ecore/ecore_private.h +++ b/src/lib/ecore/ecore_private.h | |||
@@ -10,15 +10,15 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_ECORE_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
17 | # define EAPI | 17 | # define EAPI |
18 | # endif /* ! DLL_EXPORT */ | 18 | # endif |
19 | # else | 19 | # else |
20 | # define EAPI __declspec(dllimport) | 20 | # define EAPI __declspec(dllimport) |
21 | # endif /* ! EFL_ECORE_BUILD */ | 21 | # endif |
22 | #else | 22 | #else |
23 | # ifdef __GNUC__ | 23 | # ifdef __GNUC__ |
24 | # if __GNUC__ >= 4 | 24 | # if __GNUC__ >= 4 |
@@ -29,7 +29,7 @@ | |||
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif | 31 | # endif |
32 | #endif /* ! _WIN32 */ | 32 | #endif |
33 | 33 | ||
34 | extern int _ecore_log_dom; | 34 | extern int _ecore_log_dom; |
35 | #ifdef _ECORE_DEFAULT_LOG_DOM | 35 | #ifdef _ECORE_DEFAULT_LOG_DOM |
diff --git a/src/lib/ecore_audio/Ecore_Audio.h b/src/lib/ecore_audio/Ecore_Audio.h index e562205ca1..f0835805e3 100644 --- a/src/lib/ecore_audio/Ecore_Audio.h +++ b/src/lib/ecore_audio/Ecore_Audio.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_ECORE_AUDIO_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_ECORE_AUDIO_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | /** | 33 | /** |
34 | * @file Ecore_Audio.h | 34 | * @file Ecore_Audio.h |
diff --git a/src/lib/ecore_avahi/Ecore_Avahi.h b/src/lib/ecore_avahi/Ecore_Avahi.h index 76247dbed7..ed19a12b03 100644 --- a/src/lib/ecore_avahi/Ecore_Avahi.h +++ b/src/lib/ecore_avahi/Ecore_Avahi.h | |||
@@ -12,15 +12,15 @@ | |||
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #ifdef _WIN32 | 14 | #ifdef _WIN32 |
15 | # ifdef EFL_ECORE_AVAHI_BUILD | 15 | # ifdef EFL_BUILD |
16 | # ifdef DLL_EXPORT | 16 | # ifdef DLL_EXPORT |
17 | # define EAPI __declspec(dllexport) | 17 | # define EAPI __declspec(dllexport) |
18 | # else | 18 | # else |
19 | # define EAPI | 19 | # define EAPI |
20 | # endif /* ! DLL_EXPORT */ | 20 | # endif |
21 | # else | 21 | # else |
22 | # define EAPI __declspec(dllimport) | 22 | # define EAPI __declspec(dllimport) |
23 | # endif /* ! EFL_ECORE_BUILD */ | 23 | # endif |
24 | #else | 24 | #else |
25 | # ifdef __GNUC__ | 25 | # ifdef __GNUC__ |
26 | # if __GNUC__ >= 4 | 26 | # if __GNUC__ >= 4 |
@@ -31,7 +31,7 @@ | |||
31 | # else | 31 | # else |
32 | # define EAPI | 32 | # define EAPI |
33 | # endif | 33 | # endif |
34 | #endif /* ! _WIN32 */ | 34 | #endif |
35 | 35 | ||
36 | #ifdef __cplusplus | 36 | #ifdef __cplusplus |
37 | extern "C" { | 37 | extern "C" { |
diff --git a/src/lib/ecore_buffer/Ecore_Buffer.h b/src/lib/ecore_buffer/Ecore_Buffer.h index c8400e619a..4d5c49d93e 100644 --- a/src/lib/ecore_buffer/Ecore_Buffer.h +++ b/src/lib/ecore_buffer/Ecore_Buffer.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_ECORE_BUFFER_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_ECORE_BUFFER_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -25,7 +25,7 @@ | |||
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif | 27 | # endif |
28 | #endif /* ! _WIN32 */ | 28 | #endif |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * @defgroup Ecore_Buffer_Group Ecore_Buffer - Graphics buffer functions | 31 | * @defgroup Ecore_Buffer_Group Ecore_Buffer - Graphics buffer functions |
@@ -626,4 +626,7 @@ EAPI unsigned int ecore_buffer_flags_get(Ecore_Buffer *buf); | |||
626 | } | 626 | } |
627 | #endif | 627 | #endif |
628 | 628 | ||
629 | #undef EAPI | ||
630 | #define EAPI | ||
631 | |||
629 | #endif | 632 | #endif |
diff --git a/src/lib/ecore_buffer/Ecore_Buffer_Queue.h b/src/lib/ecore_buffer/Ecore_Buffer_Queue.h index 5c82ac318a..11abf6a57b 100644 --- a/src/lib/ecore_buffer/Ecore_Buffer_Queue.h +++ b/src/lib/ecore_buffer/Ecore_Buffer_Queue.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_ECORE_BUFFER_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_ECORE_BUFFER_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -25,7 +25,7 @@ | |||
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif | 27 | # endif |
28 | #endif /* ! _WIN32 */ | 28 | #endif |
29 | 29 | ||
30 | #ifdef __cplusplus | 30 | #ifdef __cplusplus |
31 | extern "C" { | 31 | extern "C" { |
@@ -448,4 +448,7 @@ EAPI void ecore_buffer_provider_buffer_released_cb_set(Ecor | |||
448 | } | 448 | } |
449 | #endif | 449 | #endif |
450 | 450 | ||
451 | #undef EAPI | ||
452 | #define EAPI | ||
453 | |||
451 | #endif /* _ECORE_BUFFER_QUEUE_H_ */ | 454 | #endif /* _ECORE_BUFFER_QUEUE_H_ */ |
diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h index 5f04e4c39e..e5916b1b69 100644 --- a/src/lib/ecore_con/Ecore_Con.h +++ b/src/lib/ecore_con/Ecore_Con.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | #ifdef _WIN32 | 22 | #ifdef _WIN32 |
23 | # ifdef EFL_ECORE_CON_BUILD | 23 | # ifdef EFL_BUILD |
24 | # ifdef DLL_EXPORT | 24 | # ifdef DLL_EXPORT |
25 | # define EAPI __declspec(dllexport) | 25 | # define EAPI __declspec(dllexport) |
26 | # else | 26 | # else |
diff --git a/src/lib/ecore_con/Ecore_Con_Eet.h b/src/lib/ecore_con/Ecore_Con_Eet.h index a4c99dbf05..4a716752a3 100644 --- a/src/lib/ecore_con/Ecore_Con_Eet.h +++ b/src/lib/ecore_con/Ecore_Con_Eet.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_ECORE_CON_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
@@ -317,5 +317,5 @@ EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_na | |||
317 | 317 | ||
318 | #undef EAPI | 318 | #undef EAPI |
319 | #define EAPI | 319 | #define EAPI |
320 | 320 | ||
321 | #endif | 321 | #endif |
diff --git a/src/lib/ecore_con/Efl_Net.h b/src/lib/ecore_con/Efl_Net.h index 5d163e7efd..32039b9142 100644 --- a/src/lib/ecore_con/Efl_Net.h +++ b/src/lib/ecore_con/Efl_Net.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #ifdef _WIN32 | 20 | #ifdef _WIN32 |
21 | # ifdef EFL_ECORE_CON_BUILD | 21 | # ifdef EFL_BUILD |
22 | # ifdef DLL_EXPORT | 22 | # ifdef DLL_EXPORT |
23 | # define EAPI __declspec(dllexport) | 23 | # define EAPI __declspec(dllexport) |
24 | # else | 24 | # else |
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h index 4063b7655e..1039007b71 100644 --- a/src/lib/ecore_evas/Ecore_Evas.h +++ b/src/lib/ecore_evas/Ecore_Evas.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_ECORE_EVAS_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_ECORE_EVAS_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | /** | 33 | /** |
34 | * @file Ecore_Evas.h | 34 | * @file Ecore_Evas.h |
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h index 13002402a4..14cfae791d 100644 --- a/src/lib/ecore_evas/ecore_evas_private.h +++ b/src/lib/ecore_evas/ecore_evas_private.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_ECORE_EVAS_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_ECORE_EVAS_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -25,7 +25,7 @@ | |||
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif | 27 | # endif |
28 | #endif /* ! _WIN32 */ | 28 | #endif |
29 | 29 | ||
30 | #define ECORE_MAGIC_EVAS 0x76543211 | 30 | #define ECORE_MAGIC_EVAS 0x76543211 |
31 | 31 | ||
diff --git a/src/lib/ecore_file/Ecore_File.h b/src/lib/ecore_file/Ecore_File.h index 57cb550e30..39f0f7ecae 100644 --- a/src/lib/ecore_file/Ecore_File.h +++ b/src/lib/ecore_file/Ecore_File.h | |||
@@ -13,15 +13,15 @@ | |||
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #ifdef _WIN32 | 15 | #ifdef _WIN32 |
16 | # ifdef EFL_ECORE_FILE_BUILD | 16 | # ifdef EFL_BUILD |
17 | # ifdef DLL_EXPORT | 17 | # ifdef DLL_EXPORT |
18 | # define EAPI __declspec(dllexport) | 18 | # define EAPI __declspec(dllexport) |
19 | # else | 19 | # else |
20 | # define EAPI | 20 | # define EAPI |
21 | # endif /* ! DLL_EXPORT */ | 21 | # endif |
22 | # else | 22 | # else |
23 | # define EAPI __declspec(dllimport) | 23 | # define EAPI __declspec(dllimport) |
24 | # endif /* ! EFL_ECORE_FILE_BUILD */ | 24 | # endif |
25 | #else | 25 | #else |
26 | # ifdef __GNUC__ | 26 | # ifdef __GNUC__ |
27 | # if __GNUC__ >= 4 | 27 | # if __GNUC__ >= 4 |
@@ -32,7 +32,7 @@ | |||
32 | # else | 32 | # else |
33 | # define EAPI | 33 | # define EAPI |
34 | # endif | 34 | # endif |
35 | #endif /* ! _WIN32 */ | 35 | #endif |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * @file Ecore_File.h | 38 | * @file Ecore_File.h |
diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h index c4ff9ec955..9cdc11b28d 100644 --- a/src/lib/ecore_imf/Ecore_IMF.h +++ b/src/lib/ecore_imf/Ecore_IMF.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_ECORE_IMF_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_ECORE_IMF_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
@@ -27,7 +27,7 @@ | |||
27 | # else | 27 | # else |
28 | # define EAPI | 28 | # define EAPI |
29 | # endif | 29 | # endif |
30 | #endif /* ! _WIN32 */ | 30 | #endif |
31 | 31 | ||
32 | #ifdef __cplusplus | 32 | #ifdef __cplusplus |
33 | extern "C" { | 33 | extern "C" { |
diff --git a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h index f38e31f714..87431fce9f 100644 --- a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h +++ b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_ECORE_IMF_EVAS_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_ECORE_IMF_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | /** | 33 | /** |
34 | * @defgroup Ecore_IMF_Evas_Group Ecore Input Method Context Evas Helper Functions | 34 | * @defgroup Ecore_IMF_Evas_Group Ecore Input Method Context Evas Helper Functions |
diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h index 6853e764b5..0e28909729 100644 --- a/src/lib/ecore_input/Ecore_Input.h +++ b/src/lib/ecore_input/Ecore_Input.h | |||
@@ -16,15 +16,15 @@ | |||
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | #ifdef _WIN32 | 18 | #ifdef _WIN32 |
19 | # ifdef EFL_ECORE_INPUT_BUILD | 19 | # ifdef EFL_BUILD |
20 | # ifdef DLL_EXPORT | 20 | # ifdef DLL_EXPORT |
21 | # define EAPI __declspec(dllexport) | 21 | # define EAPI __declspec(dllexport) |
22 | # else | 22 | # else |
23 | # define EAPI | 23 | # define EAPI |
24 | # endif /* ! DLL_EXPORT */ | 24 | # endif |
25 | # else | 25 | # else |
26 | # define EAPI __declspec(dllimport) | 26 | # define EAPI __declspec(dllimport) |
27 | # endif /* ! EFL_ECORE_INPUT_BUILD */ | 27 | # endif |
28 | #else | 28 | #else |
29 | # ifdef __GNUC__ | 29 | # ifdef __GNUC__ |
30 | # if __GNUC__ >= 4 | 30 | # if __GNUC__ >= 4 |
diff --git a/src/lib/ecore_input_evas/Ecore_Input_Evas.h b/src/lib/ecore_input_evas/Ecore_Input_Evas.h index e126e45805..1ec065613f 100644 --- a/src/lib/ecore_input_evas/Ecore_Input_Evas.h +++ b/src/lib/ecore_input_evas/Ecore_Input_Evas.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_ECORE_INPUT_EVAS_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_ECORE_INPUT_EVAS_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
diff --git a/src/lib/ecore_ipc/Ecore_Ipc.h b/src/lib/ecore_ipc/Ecore_Ipc.h index 47e3c174d8..5da43c7639 100644 --- a/src/lib/ecore_ipc/Ecore_Ipc.h +++ b/src/lib/ecore_ipc/Ecore_Ipc.h | |||
@@ -8,7 +8,7 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_ECORE_IPC_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
diff --git a/src/lib/ecore_sdl/Ecore_Sdl.h b/src/lib/ecore_sdl/Ecore_Sdl.h index 36b69a4d4b..50b87069ad 100644 --- a/src/lib/ecore_sdl/Ecore_Sdl.h +++ b/src/lib/ecore_sdl/Ecore_Sdl.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_ECORE_SDL_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_ECORE_SDL_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -25,7 +25,7 @@ | |||
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif | 27 | # endif |
28 | #endif /* ! _WIN32 */ | 28 | #endif |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * @file | 31 | * @file |
diff --git a/src/lib/ecore_win32/Ecore_Win32.h b/src/lib/ecore_win32/Ecore_Win32.h index 356200ff4a..cfa7f5adc1 100644 --- a/src/lib/ecore_win32/Ecore_Win32.h +++ b/src/lib/ecore_win32/Ecore_Win32.h | |||
@@ -23,15 +23,15 @@ | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #ifdef _WIN32 | 25 | #ifdef _WIN32 |
26 | # ifdef EFL_ECORE_WIN32_BUILD | 26 | # ifdef EFL_BUILD |
27 | # ifdef DLL_EXPORT | 27 | # ifdef DLL_EXPORT |
28 | # define EAPI __declspec(dllexport) | 28 | # define EAPI __declspec(dllexport) |
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif /* ! DLL_EXPORT */ | 31 | # endif |
32 | # else | 32 | # else |
33 | # define EAPI __declspec(dllimport) | 33 | # define EAPI __declspec(dllimport) |
34 | # endif /* ! EFL_ECORE_WIN32_BUILD */ | 34 | # endif |
35 | #else | 35 | #else |
36 | # ifdef __GNUC__ | 36 | # ifdef __GNUC__ |
37 | # if __GNUC__ >= 4 | 37 | # if __GNUC__ >= 4 |
@@ -42,7 +42,7 @@ | |||
42 | # else | 42 | # else |
43 | # define EAPI | 43 | # define EAPI |
44 | # endif | 44 | # endif |
45 | #endif /* ! _WIN32 */ | 45 | #endif |
46 | 46 | ||
47 | 47 | ||
48 | #ifdef __cplusplus | 48 | #ifdef __cplusplus |
diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h index b9a2ffd416..e2268f3ad8 100644 --- a/src/lib/ector/Ector.h +++ b/src/lib/ector/Ector.h | |||
@@ -10,15 +10,15 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_ECTOR_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
17 | # define EAPI | 17 | # define EAPI |
18 | # endif /* ! DLL_EXPORT */ | 18 | # endif |
19 | # else | 19 | # else |
20 | # define EAPI __declspec(dllimport) | 20 | # define EAPI __declspec(dllimport) |
21 | # endif /* ! EFL_EO_BUILD */ | 21 | # endif |
22 | #else | 22 | #else |
23 | # ifdef __GNUC__ | 23 | # ifdef __GNUC__ |
24 | # if __GNUC__ >= 4 | 24 | # if __GNUC__ >= 4 |
@@ -29,7 +29,7 @@ | |||
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif | 31 | # endif |
32 | #endif /* ! _WIN32 */ | 32 | #endif |
33 | 33 | ||
34 | #ifdef __cplusplus | 34 | #ifdef __cplusplus |
35 | extern "C" { | 35 | extern "C" { |
diff --git a/src/lib/ector/cairo/Ector_Cairo.h b/src/lib/ector/cairo/Ector_Cairo.h index b0f0f95a4a..99eeafac9a 100644 --- a/src/lib/ector/cairo/Ector_Cairo.h +++ b/src/lib/ector/cairo/Ector_Cairo.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_ECTOR_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_EO_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
@@ -27,7 +27,7 @@ | |||
27 | # else | 27 | # else |
28 | # define EAPI | 28 | # define EAPI |
29 | # endif | 29 | # endif |
30 | #endif /* ! _WIN32 */ | 30 | #endif |
31 | 31 | ||
32 | #ifdef EFL_BETA_API_SUPPORT | 32 | #ifdef EFL_BETA_API_SUPPORT |
33 | 33 | ||
diff --git a/src/lib/ector/gl/Ector_GL.h b/src/lib/ector/gl/Ector_GL.h index d382ac25c3..131288a180 100644 --- a/src/lib/ector/gl/Ector_GL.h +++ b/src/lib/ector/gl/Ector_GL.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_ECTOR_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_EO_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
@@ -27,7 +27,7 @@ | |||
27 | # else | 27 | # else |
28 | # define EAPI | 28 | # define EAPI |
29 | # endif | 29 | # endif |
30 | #endif /* ! _WIN32 */ | 30 | #endif |
31 | 31 | ||
32 | #ifdef EFL_BETA_API_SUPPORT | 32 | #ifdef EFL_BETA_API_SUPPORT |
33 | 33 | ||
diff --git a/src/lib/ector/software/Ector_Software.h b/src/lib/ector/software/Ector_Software.h index 1a43a2955f..2f9192ff30 100644 --- a/src/lib/ector/software/Ector_Software.h +++ b/src/lib/ector/software/Ector_Software.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_ECTOR_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_EO_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
@@ -27,7 +27,7 @@ | |||
27 | # else | 27 | # else |
28 | # define EAPI | 28 | # define EAPI |
29 | # endif | 29 | # endif |
30 | #endif /* ! _WIN32 */ | 30 | #endif |
31 | 31 | ||
32 | #ifdef EFL_BETA_API_SUPPORT | 32 | #ifdef EFL_BETA_API_SUPPORT |
33 | 33 | ||
diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h index 82f3cbac2d..6f64c64293 100644 --- a/src/lib/edje/Edje.h +++ b/src/lib/edje/Edje.h | |||
@@ -221,15 +221,15 @@ param in edje programs | |||
221 | #endif | 221 | #endif |
222 | 222 | ||
223 | #ifdef _WIN32 | 223 | #ifdef _WIN32 |
224 | # ifdef EFL_EDJE_BUILD | 224 | # ifdef EFL_BUILD |
225 | # ifdef DLL_EXPORT | 225 | # ifdef DLL_EXPORT |
226 | # define EAPI __declspec(dllexport) | 226 | # define EAPI __declspec(dllexport) |
227 | # else | 227 | # else |
228 | # define EAPI | 228 | # define EAPI |
229 | # endif /* ! DLL_EXPORT */ | 229 | # endif |
230 | # else | 230 | # else |
231 | # define EAPI __declspec(dllimport) | 231 | # define EAPI __declspec(dllimport) |
232 | # endif /* ! EFL_EDJE_BUILD */ | 232 | # endif |
233 | #else | 233 | #else |
234 | # ifdef __GNUC__ | 234 | # ifdef __GNUC__ |
235 | # if __GNUC__ >= 4 | 235 | # if __GNUC__ >= 4 |
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h index 7bb5a07c1f..d30b28e063 100644 --- a/src/lib/edje/Edje_Edit.h +++ b/src/lib/edje/Edje_Edit.h | |||
@@ -12,15 +12,15 @@ | |||
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #ifdef _WIN32 | 14 | #ifdef _WIN32 |
15 | # ifdef EFL_EDJE_BUILD | 15 | # ifdef EFL_BUILD |
16 | # ifdef DLL_EXPORT | 16 | # ifdef DLL_EXPORT |
17 | # define EAPI __declspec(dllexport) | 17 | # define EAPI __declspec(dllexport) |
18 | # else | 18 | # else |
19 | # define EAPI | 19 | # define EAPI |
20 | # endif /* ! DLL_EXPORT */ | 20 | # endif |
21 | # else | 21 | # else |
22 | # define EAPI __declspec(dllimport) | 22 | # define EAPI __declspec(dllimport) |
23 | # endif /* ! EFL_EDJE_BUILD */ | 23 | # endif |
24 | #else | 24 | #else |
25 | # ifdef __GNUC__ | 25 | # ifdef __GNUC__ |
26 | # if __GNUC__ >= 4 | 26 | # if __GNUC__ >= 4 |
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 3906314213..d130569a04 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h | |||
@@ -75,15 +75,15 @@ | |||
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | #ifdef _WIN32 | 77 | #ifdef _WIN32 |
78 | # ifdef EFL_EDJE_BUILD | 78 | # ifdef EFL_BUILD |
79 | # ifdef DLL_EXPORT | 79 | # ifdef DLL_EXPORT |
80 | # define EAPI __declspec(dllexport) | 80 | # define EAPI __declspec(dllexport) |
81 | # else | 81 | # else |
82 | # define EAPI | 82 | # define EAPI |
83 | # endif /* ! DLL_EXPORT */ | 83 | # endif |
84 | # else | 84 | # else |
85 | # define EAPI __declspec(dllimport) | 85 | # define EAPI __declspec(dllimport) |
86 | # endif /* ! EFL_EDJE_BUILD */ | 86 | # endif |
87 | #else | 87 | #else |
88 | # ifdef __GNUC__ | 88 | # ifdef __GNUC__ |
89 | # if __GNUC__ >= 4 | 89 | # if __GNUC__ >= 4 |
diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h index 60547bbd4a..8fc47f93cd 100644 --- a/src/lib/eet/Eet.h +++ b/src/lib/eet/Eet.h | |||
@@ -102,29 +102,29 @@ | |||
102 | 102 | ||
103 | #ifdef EAPI | 103 | #ifdef EAPI |
104 | # undef EAPI | 104 | # undef EAPI |
105 | #endif /* ifdef EAPI */ | 105 | #endif |
106 | 106 | ||
107 | #ifdef _WIN32 | 107 | #ifdef _WIN32 |
108 | # ifdef EFL_EET_BUILD | 108 | # ifdef EFL_BUILD |
109 | # ifdef DLL_EXPORT | 109 | # ifdef DLL_EXPORT |
110 | # define EAPI __declspec(dllexport) | 110 | # define EAPI __declspec(dllexport) |
111 | # else /* ifdef DLL_EXPORT */ | 111 | # else |
112 | # define EAPI | 112 | # define EAPI |
113 | # endif /* ! DLL_EXPORT */ | 113 | # endif |
114 | # else /* ifdef EFL_EET_BUILD */ | 114 | # else |
115 | # define EAPI __declspec(dllimport) | 115 | # define EAPI __declspec(dllimport) |
116 | # endif /* ! EFL_EET_BUILD */ | 116 | # endif |
117 | #else /* ifdef _WIN32 */ | 117 | #else |
118 | # ifdef __GNUC__ | 118 | # ifdef __GNUC__ |
119 | # if __GNUC__ >= 4 | 119 | # if __GNUC__ >= 4 |
120 | # define EAPI __attribute__ ((visibility("default"))) | 120 | # define EAPI __attribute__ ((visibility("default"))) |
121 | # else /* if __GNUC__ >= 4 */ | 121 | # else |
122 | # define EAPI | 122 | # define EAPI |
123 | # endif /* if __GNUC__ >= 4 */ | 123 | # endif |
124 | # else /* ifdef __GNUC__ */ | 124 | # else |
125 | # define EAPI | 125 | # define EAPI |
126 | # endif /* ifdef __GNUC__ */ | 126 | # endif |
127 | #endif /* ! _WIN32 */ | 127 | #endif |
128 | 128 | ||
129 | #ifdef __cplusplus | 129 | #ifdef __cplusplus |
130 | extern "C" { | 130 | extern "C" { |
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 030d26cd0f..5f47825b0c 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h | |||
@@ -12,15 +12,15 @@ extern "C" { | |||
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | #ifdef _WIN32 | 14 | #ifdef _WIN32 |
15 | # ifdef EFL_EFL_BUILD | 15 | # ifdef EFL_BUILD |
16 | # ifdef DLL_EXPORT | 16 | # ifdef DLL_EXPORT |
17 | # define EAPI __declspec(dllexport) | 17 | # define EAPI __declspec(dllexport) |
18 | # else | 18 | # else |
19 | # define EAPI | 19 | # define EAPI |
20 | # endif /* ! DLL_EXPORT */ | 20 | # endif |
21 | # else | 21 | # else |
22 | # define EAPI __declspec(dllimport) | 22 | # define EAPI __declspec(dllimport) |
23 | # endif /* ! EFL_EFL_BUILD */ | 23 | # endif |
24 | #else | 24 | #else |
25 | # ifdef __GNUC__ | 25 | # ifdef __GNUC__ |
26 | # if __GNUC__ >= 4 | 26 | # if __GNUC__ >= 4 |
@@ -31,7 +31,7 @@ extern "C" { | |||
31 | # else | 31 | # else |
32 | # define EAPI | 32 | # define EAPI |
33 | # endif | 33 | # endif |
34 | #endif /* ! _WIN32 */ | 34 | #endif |
35 | 35 | ||
36 | #define EFL_VERSION_1_18 1 | 36 | #define EFL_VERSION_1_18 1 |
37 | #define EFL_VERSION_1_19 1 | 37 | #define EFL_VERSION_1_19 1 |
@@ -39,7 +39,7 @@ extern "C" { | |||
39 | #define EFL_VERSION_1_21 1 | 39 | #define EFL_VERSION_1_21 1 |
40 | 40 | ||
41 | /* Add here all the required ifdef for any @protected method */ | 41 | /* Add here all the required ifdef for any @protected method */ |
42 | #ifdef EFL_EFL_BUILD | 42 | #ifdef EFL_BUILD |
43 | # define EFL_PACK_LAYOUT_PROTECTED | 43 | # define EFL_PACK_LAYOUT_PROTECTED |
44 | # define EFL_GFX_SIZE_HINT_PROTECTED | 44 | # define EFL_GFX_SIZE_HINT_PROTECTED |
45 | #endif | 45 | #endif |
diff --git a/src/lib/efl_wl/Efl_Wl.h b/src/lib/efl_wl/Efl_Wl.h index 91e22b3a06..0534587945 100644 --- a/src/lib/efl_wl/Efl_Wl.h +++ b/src/lib/efl_wl/Efl_Wl.h | |||
@@ -9,26 +9,14 @@ | |||
9 | # undef EAPI | 9 | # undef EAPI |
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef __GNUC__ |
13 | # ifdef EFL_EINA_BUILD | 13 | # if __GNUC__ >= 4 |
14 | # ifdef DLL_EXPORT | 14 | # define EAPI __attribute__ ((visibility("default"))) |
15 | # define EAPI __declspec(dllexport) | ||
16 | # else | ||
17 | # define EAPI | ||
18 | # endif /* ! DLL_EXPORT */ | ||
19 | # else | ||
20 | # define EAPI __declspec(dllimport) | ||
21 | # endif /* ! EFL_EINA_BUILD */ | ||
22 | #else | ||
23 | # ifdef __GNUC__ | ||
24 | # if __GNUC__ >= 4 | ||
25 | # define EAPI __attribute__ ((visibility("default"))) | ||
26 | # else | ||
27 | # define EAPI | ||
28 | # endif | ||
29 | # else | 15 | # else |
30 | # define EAPI | 16 | # define EAPI |
31 | # endif | 17 | # endif |
18 | #else | ||
19 | # define EAPI | ||
32 | #endif | 20 | #endif |
33 | 21 | ||
34 | /** | 22 | /** |
diff --git a/src/lib/efreet/Efreet.h b/src/lib/efreet/Efreet.h index e83784da1d..921ae52476 100644 --- a/src/lib/efreet/Efreet.h +++ b/src/lib/efreet/Efreet.h | |||
@@ -79,15 +79,15 @@ | |||
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | #ifdef _WIN32 | 81 | #ifdef _WIN32 |
82 | # ifdef EFL_EFREET_BUILD | 82 | # ifdef EFL_BUILD |
83 | # ifdef DLL_EXPORT | 83 | # ifdef DLL_EXPORT |
84 | # define EAPI __declspec(dllexport) | 84 | # define EAPI __declspec(dllexport) |
85 | # else | 85 | # else |
86 | # define EAPI | 86 | # define EAPI |
87 | # endif /* ! DLL_EXPORT */ | 87 | # endif |
88 | # else | 88 | # else |
89 | # define EAPI __declspec(dllimport) | 89 | # define EAPI __declspec(dllimport) |
90 | # endif /* ! EFL_EFREET_BUILD */ | 90 | # endif |
91 | #else | 91 | #else |
92 | # ifdef __GNUC__ | 92 | # ifdef __GNUC__ |
93 | # if __GNUC__ >= 4 | 93 | # if __GNUC__ >= 4 |
diff --git a/src/lib/efreet/Efreet_Mime.h b/src/lib/efreet/Efreet_Mime.h index 1e1bc2b22b..29d65e516c 100644 --- a/src/lib/efreet/Efreet_Mime.h +++ b/src/lib/efreet/Efreet_Mime.h | |||
@@ -19,15 +19,15 @@ | |||
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #ifdef _WIN32 | 21 | #ifdef _WIN32 |
22 | # ifdef EFL_EFREET_BUILD | 22 | # ifdef EFL_BUILD |
23 | # ifdef DLL_EXPORT | 23 | # ifdef DLL_EXPORT |
24 | # define EAPI __declspec(dllexport) | 24 | # define EAPI __declspec(dllexport) |
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif /* ! DLL_EXPORT */ | 27 | # endif |
28 | # else | 28 | # else |
29 | # define EAPI __declspec(dllimport) | 29 | # define EAPI __declspec(dllimport) |
30 | # endif /* ! EFL_EFREET_MIME_BUILD */ | 30 | # endif |
31 | #else | 31 | #else |
32 | # ifdef __GNUC__ | 32 | # ifdef __GNUC__ |
33 | # if __GNUC__ >= 4 | 33 | # if __GNUC__ >= 4 |
@@ -127,4 +127,7 @@ EAPI void efreet_mime_type_cache_flush(void); | |||
127 | } | 127 | } |
128 | #endif | 128 | #endif |
129 | 129 | ||
130 | #undef EAPI | ||
131 | #define EAPI | ||
132 | |||
130 | #endif | 133 | #endif |
diff --git a/src/lib/efreet/Efreet_Trash.h b/src/lib/efreet/Efreet_Trash.h index 64af9ea74c..5ecf41d9be 100644 --- a/src/lib/efreet/Efreet_Trash.h +++ b/src/lib/efreet/Efreet_Trash.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_EFREET_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_EFREET_TRASH_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -101,4 +101,7 @@ EAPI int efreet_trash_empty_trash(void); | |||
101 | } | 101 | } |
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | #undef EAPI | ||
105 | #define EAPI | ||
106 | |||
104 | #endif | 107 | #endif |
diff --git a/src/lib/efreet/efreet_cache_private.h b/src/lib/efreet/efreet_cache_private.h index 79dbfa0c24..97dbd45a1e 100644 --- a/src/lib/efreet/efreet_cache_private.h +++ b/src/lib/efreet/efreet_cache_private.h | |||
@@ -17,15 +17,15 @@ | |||
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | #ifdef _WIN32 | 19 | #ifdef _WIN32 |
20 | # ifdef EFL_EFREET_BUILD | 20 | # ifdef EFL_BUILD |
21 | # ifdef DLL_EXPORT | 21 | # ifdef DLL_EXPORT |
22 | # define EAPI __declspec(dllexport) | 22 | # define EAPI __declspec(dllexport) |
23 | # else | 23 | # else |
24 | # define EAPI | 24 | # define EAPI |
25 | # endif /* ! DLL_EXPORT */ | 25 | # endif |
26 | # else | 26 | # else |
27 | # define EAPI __declspec(dllimport) | 27 | # define EAPI __declspec(dllimport) |
28 | # endif /* ! EFL_EFREET_BUILD */ | 28 | # endif |
29 | #else | 29 | #else |
30 | # ifdef __GNUC__ | 30 | # ifdef __GNUC__ |
31 | # if __GNUC__ >= 4 | 31 | # if __GNUC__ >= 4 |
diff --git a/src/lib/efreet/efreet_private.h b/src/lib/efreet/efreet_private.h index 47d6deae12..eb42c28f74 100644 --- a/src/lib/efreet/efreet_private.h +++ b/src/lib/efreet/efreet_private.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_EFREET_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_EFREET_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
diff --git a/src/lib/eina/eina_internal.h b/src/lib/eina/eina_internal.h index acf55fe347..b5bdbad414 100644 --- a/src/lib/eina/eina_internal.h +++ b/src/lib/eina/eina_internal.h | |||
@@ -13,15 +13,15 @@ | |||
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #ifdef _WIN32 | 15 | #ifdef _WIN32 |
16 | # ifdef EFL_EINA_BUILD | 16 | # ifdef EFL_BUILD |
17 | # ifdef DLL_EXPORT | 17 | # ifdef DLL_EXPORT |
18 | # define EAPI __declspec(dllexport) | 18 | # define EAPI __declspec(dllexport) |
19 | # else | 19 | # else |
20 | # define EAPI | 20 | # define EAPI |
21 | # endif /* ! DLL_EXPORT */ | 21 | # endif |
22 | # else | 22 | # else |
23 | # define EAPI __declspec(dllimport) | 23 | # define EAPI __declspec(dllimport) |
24 | # endif /* ! EFL_EINA_BUILD */ | 24 | # endif |
25 | # define EAPI_WEAK | 25 | # define EAPI_WEAK |
26 | #else | 26 | #else |
27 | # ifdef __GNUC__ | 27 | # ifdef __GNUC__ |
diff --git a/src/lib/eina/eina_types.h b/src/lib/eina/eina_types.h index 3d15a3f42d..84979022c9 100644 --- a/src/lib/eina/eina_types.h +++ b/src/lib/eina/eina_types.h | |||
@@ -36,15 +36,15 @@ | |||
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #ifdef _WIN32 | 38 | #ifdef _WIN32 |
39 | # ifdef EFL_EINA_BUILD | 39 | # ifdef EFL_BUILD |
40 | # ifdef DLL_EXPORT | 40 | # ifdef DLL_EXPORT |
41 | # define EAPI __declspec(dllexport) | 41 | # define EAPI __declspec(dllexport) |
42 | # else | 42 | # else |
43 | # define EAPI | 43 | # define EAPI |
44 | # endif /* ! DLL_EXPORT */ | 44 | # endif |
45 | # else | 45 | # else |
46 | # define EAPI __declspec(dllimport) | 46 | # define EAPI __declspec(dllimport) |
47 | # endif /* ! EFL_EINA_BUILD */ | 47 | # endif |
48 | # define EAPI_WEAK | 48 | # define EAPI_WEAK |
49 | #else | 49 | #else |
50 | # ifdef __GNUC__ | 50 | # ifdef __GNUC__ |
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h index d2c36b1ae8..df2cec27df 100644 --- a/src/lib/eio/Eio.h +++ b/src/lib/eio/Eio.h | |||
@@ -37,15 +37,15 @@ | |||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #ifdef _WIN32 | 39 | #ifdef _WIN32 |
40 | # ifdef EFL_EIO_BUILD | 40 | # ifdef EFL_BUILD |
41 | # ifdef DLL_EXPORT | 41 | # ifdef DLL_EXPORT |
42 | # define EAPI __declspec(dllexport) | 42 | # define EAPI __declspec(dllexport) |
43 | # else | 43 | # else |
44 | # define EAPI | 44 | # define EAPI |
45 | # endif /* ! DLL_EXPORT */ | 45 | # endif |
46 | # else | 46 | # else |
47 | # define EAPI __declspec(dllimport) | 47 | # define EAPI __declspec(dllimport) |
48 | # endif /* ! EFL_EIO_BUILD */ | 48 | # endif |
49 | #else | 49 | #else |
50 | # ifdef __GNUC__ | 50 | # ifdef __GNUC__ |
51 | # if __GNUC__ >= 4 | 51 | # if __GNUC__ >= 4 |
@@ -56,7 +56,7 @@ | |||
56 | # else | 56 | # else |
57 | # define EAPI | 57 | # define EAPI |
58 | # endif | 58 | # endif |
59 | #endif /* ! _WIN32 */ | 59 | #endif |
60 | 60 | ||
61 | 61 | ||
62 | #ifdef __cplusplus | 62 | #ifdef __cplusplus |
diff --git a/src/lib/eldbus/Eldbus.h b/src/lib/eldbus/Eldbus.h index db61f21ac2..15f8293062 100644 --- a/src/lib/eldbus/Eldbus.h +++ b/src/lib/eldbus/Eldbus.h | |||
@@ -87,15 +87,15 @@ | |||
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | #ifdef _WIN32 | 89 | #ifdef _WIN32 |
90 | # ifdef EFL_ELDBUS_BUILD | 90 | # ifdef EFL_BUILD |
91 | # ifdef DLL_EXPORT | 91 | # ifdef DLL_EXPORT |
92 | # define EAPI __declspec(dllexport) | 92 | # define EAPI __declspec(dllexport) |
93 | # else | 93 | # else |
94 | # define EAPI | 94 | # define EAPI |
95 | # endif /* ! DLL_EXPORT */ | 95 | # endif |
96 | # else | 96 | # else |
97 | # define EAPI __declspec(dllimport) | 97 | # define EAPI __declspec(dllimport) |
98 | # endif /* ! EFL_ELDBUS_BUILD */ | 98 | # endif |
99 | #else | 99 | #else |
100 | # ifdef __GNUC__ | 100 | # ifdef __GNUC__ |
101 | # if __GNUC__ >= 4 | 101 | # if __GNUC__ >= 4 |
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index cb548f70a7..d069abdcad 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h | |||
@@ -57,15 +57,15 @@ | |||
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | #ifdef _WIN32 | 59 | #ifdef _WIN32 |
60 | # ifdef EFL_ELEMENTARY_BUILD | 60 | # ifdef EFL_BUILD |
61 | # ifdef DLL_EXPORT | 61 | # ifdef DLL_EXPORT |
62 | # define EAPI __declspec(dllexport) | 62 | # define EAPI __declspec(dllexport) |
63 | # else | 63 | # else |
64 | # define EAPI | 64 | # define EAPI |
65 | # endif /* ! DLL_EXPORT */ | 65 | # endif |
66 | # else | 66 | # else |
67 | # define EAPI __declspec(dllimport) | 67 | # define EAPI __declspec(dllimport) |
68 | # endif /* ! EFL_ECORE_BUILD */ | 68 | # endif |
69 | # define EAPI_WEAK | 69 | # define EAPI_WEAK |
70 | #else | 70 | #else |
71 | # ifdef __GNUC__ | 71 | # ifdef __GNUC__ |
@@ -80,7 +80,7 @@ | |||
80 | # define EAPI | 80 | # define EAPI |
81 | # define EAPI_WEAK | 81 | # define EAPI_WEAK |
82 | # endif | 82 | # endif |
83 | #endif /* ! _WIN32 */ | 83 | #endif |
84 | 84 | ||
85 | #define EWAPI EAPI EAPI_WEAK | 85 | #define EWAPI EAPI EAPI_WEAK |
86 | 86 | ||
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index fa34c3ed43..a16e3f8a0f 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h | |||
@@ -93,10 +93,10 @@ | |||
93 | # define EAPI __declspec(dllexport) | 93 | # define EAPI __declspec(dllexport) |
94 | # else | 94 | # else |
95 | # define EAPI | 95 | # define EAPI |
96 | # endif /* ! DLL_EXPORT */ | 96 | # endif |
97 | # else | 97 | # else |
98 | # define EAPI __declspec(dllimport) | 98 | # define EAPI __declspec(dllimport) |
99 | # endif /* ! EFL_EVAS_BUILD */ | 99 | # endif |
100 | # define EAPI_WEAK | 100 | # define EAPI_WEAK |
101 | #else | 101 | #else |
102 | # ifdef __GNUC__ | 102 | # ifdef __GNUC__ |
@@ -111,7 +111,7 @@ | |||
111 | # define EAPI | 111 | # define EAPI |
112 | # define EAPI_WEAK | 112 | # define EAPI_WEAK |
113 | # endif | 113 | # endif |
114 | #endif /* ! _WIN32 */ | 114 | #endif |
115 | 115 | ||
116 | #define EWAPI EAPI EAPI_WEAK | 116 | #define EWAPI EAPI EAPI_WEAK |
117 | 117 | ||
diff --git a/src/lib/elementary/elm_module_helper.h b/src/lib/elementary/elm_module_helper.h index 6d9840af4b..8f882dabaa 100644 --- a/src/lib/elementary/elm_module_helper.h +++ b/src/lib/elementary/elm_module_helper.h | |||
@@ -18,10 +18,10 @@ | |||
18 | # define EAPI __declspec(dllexport) | 18 | # define EAPI __declspec(dllexport) |
19 | # else | 19 | # else |
20 | # define EAPI | 20 | # define EAPI |
21 | # endif /* ! DLL_EXPORT */ | 21 | # endif |
22 | # else | 22 | # else |
23 | # define EAPI __declspec(dllimport) | 23 | # define EAPI __declspec(dllimport) |
24 | # endif /* ! EFL_EVAS_BUILD */ | 24 | # endif |
25 | # define EAPI_WEAK | 25 | # define EAPI_WEAK |
26 | #else | 26 | #else |
27 | # ifdef __GNUC__ | 27 | # ifdef __GNUC__ |
@@ -36,7 +36,7 @@ | |||
36 | # define EAPI | 36 | # define EAPI |
37 | # define EAPI_WEAK | 37 | # define EAPI_WEAK |
38 | # endif | 38 | # endif |
39 | #endif /* ! _WIN32 */ | 39 | #endif |
40 | 40 | ||
41 | #define EWAPI EAPI EAPI_WEAK | 41 | #define EWAPI EAPI EAPI_WEAK |
42 | 42 | ||
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index bfb77147b4..ec70ee4fbe 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h | |||
@@ -38,10 +38,10 @@ | |||
38 | # else | 38 | # else |
39 | # error "no DLL_EXPORT" | 39 | # error "no DLL_EXPORT" |
40 | # define EAPI | 40 | # define EAPI |
41 | # endif /* ! DLL_EXPORT */ | 41 | # endif |
42 | # else | 42 | # else |
43 | # define EAPI __declspec(dllimport) | 43 | # define EAPI __declspec(dllimport) |
44 | # endif /* ! EFL_EVAS_BUILD */ | 44 | # endif |
45 | # define EAPI_WEAK | 45 | # define EAPI_WEAK |
46 | # else | 46 | # else |
47 | # ifdef __GNUC__ | 47 | # ifdef __GNUC__ |
@@ -56,7 +56,7 @@ | |||
56 | # define EAPI | 56 | # define EAPI |
57 | # define EAPI_WEAK | 57 | # define EAPI_WEAK |
58 | # endif | 58 | # endif |
59 | # endif /* ! _WIN32 */ | 59 | # endif |
60 | 60 | ||
61 | # define EWAPI EAPI EAPI_WEAK | 61 | # define EWAPI EAPI EAPI_WEAK |
62 | 62 | ||
diff --git a/src/lib/elocation/Elocation.h b/src/lib/elocation/Elocation.h index 60002c0384..6ebec636fa 100644 --- a/src/lib/elocation/Elocation.h +++ b/src/lib/elocation/Elocation.h | |||
@@ -39,15 +39,15 @@ | |||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #ifdef _WIN32 | 41 | #ifdef _WIN32 |
42 | # ifdef EFL_ELOCATION_BUILD | 42 | # ifdef EFL_BUILD |
43 | # ifdef DLL_EXPORT | 43 | # ifdef DLL_EXPORT |
44 | # define EAPI __declspec(dllexport) | 44 | # define EAPI __declspec(dllexport) |
45 | # else | 45 | # else |
46 | # define EAPI | 46 | # define EAPI |
47 | # endif /* ! DLL_EXPORT */ | 47 | # endif |
48 | # else | 48 | # else |
49 | # define EAPI __declspec(dllimport) | 49 | # define EAPI __declspec(dllimport) |
50 | # endif /* ! EFL_ELOCATION_BUILD */ | 50 | # endif |
51 | #else | 51 | #else |
52 | # ifdef __GNUC__ | 52 | # ifdef __GNUC__ |
53 | # if __GNUC__ >= 4 | 53 | # if __GNUC__ >= 4 |
@@ -58,7 +58,7 @@ | |||
58 | # else | 58 | # else |
59 | # define EAPI | 59 | # define EAPI |
60 | # endif | 60 | # endif |
61 | #endif /* ! _WIN32 */ | 61 | #endif |
62 | 62 | ||
63 | #ifdef EFL_BETA_API_SUPPORT | 63 | #ifdef EFL_BETA_API_SUPPORT |
64 | 64 | ||
@@ -427,4 +427,7 @@ EAPI void elocation_shutdown(void); | |||
427 | 427 | ||
428 | #endif /* BETA API */ | 428 | #endif /* BETA API */ |
429 | 429 | ||
430 | #undef EAPI | ||
431 | #define EAPI | ||
432 | |||
430 | #endif | 433 | #endif |
diff --git a/src/lib/elput/Elput.h b/src/lib/elput/Elput.h index db62c52d10..2a63d561e3 100644 --- a/src/lib/elput/Elput.h +++ b/src/lib/elput/Elput.h | |||
@@ -5,27 +5,15 @@ | |||
5 | # undef EAPI | 5 | # undef EAPI |
6 | # endif | 6 | # endif |
7 | 7 | ||
8 | # ifdef _WIN32 | 8 | # ifdef __GNUC__ |
9 | # ifdef EFL_ELPUT_BUILD | 9 | # if __GNUC__ >= 4 |
10 | # ifdef DLL_EXPORT | 10 | # define EAPI __attribute__ ((visibility("default"))) |
11 | # define EAPI __declspec(dllexport) | ||
12 | # else | ||
13 | # define EAPI | ||
14 | # endif /* ! DLL_EXPORT */ | ||
15 | # else | ||
16 | # define EAPI __declspec(dllimport) | ||
17 | # endif /* ! EFL_ELPUT_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 | 11 | # else |
26 | # define EAPI | 12 | # define EAPI |
27 | # endif | 13 | # endif |
28 | # endif /* ! _WIN32 */ | 14 | # else |
15 | # define EAPI | ||
16 | # endif | ||
29 | 17 | ||
30 | # ifdef EFL_BETA_API_SUPPORT | 18 | # ifdef EFL_BETA_API_SUPPORT |
31 | 19 | ||
diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h index 4c0f9cb3c5..2d13df5c77 100644 --- a/src/lib/elua/Elua.h +++ b/src/lib/elua/Elua.h | |||
@@ -23,15 +23,15 @@ | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #ifdef _WIN32 | 25 | #ifdef _WIN32 |
26 | # ifdef EFL_ELUA_BUILD | 26 | # ifdef EFL_BUILD |
27 | # ifdef DLL_EXPORT | 27 | # ifdef DLL_EXPORT |
28 | # define EAPI __declspec(dllexport) | 28 | # define EAPI __declspec(dllexport) |
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif /* ! DLL_EXPORT */ | 31 | # endif |
32 | # else | 32 | # else |
33 | # define EAPI __declspec(dllimport) | 33 | # define EAPI __declspec(dllimport) |
34 | # endif /* ! EFL_ELUA_BUILD */ | 34 | # endif |
35 | #else | 35 | #else |
36 | # ifdef __GNUC__ | 36 | # ifdef __GNUC__ |
37 | # if __GNUC__ >= 4 | 37 | # if __GNUC__ >= 4 |
@@ -42,7 +42,7 @@ | |||
42 | # else | 42 | # else |
43 | # define EAPI | 43 | # define EAPI |
44 | # endif | 44 | # endif |
45 | #endif /* ! _WIN32 */ | 45 | #endif |
46 | 46 | ||
47 | #ifdef __cplusplus | 47 | #ifdef __cplusplus |
48 | extern "C" { | 48 | extern "C" { |
diff --git a/src/lib/embryo/Embryo.h b/src/lib/embryo/Embryo.h index fc358ef6e6..51d626b362 100644 --- a/src/lib/embryo/Embryo.h +++ b/src/lib/embryo/Embryo.h | |||
@@ -343,15 +343,15 @@ This is the @e only file you need to include. | |||
343 | #endif | 343 | #endif |
344 | 344 | ||
345 | #ifdef _WIN32 | 345 | #ifdef _WIN32 |
346 | # ifdef EFL_EMBRYO_BUILD | 346 | # ifdef EFL_BUILD |
347 | # ifdef DLL_EXPORT | 347 | # ifdef DLL_EXPORT |
348 | # define EAPI __declspec(dllexport) | 348 | # define EAPI __declspec(dllexport) |
349 | # else | 349 | # else |
350 | # define EAPI | 350 | # define EAPI |
351 | # endif /* ! DLL_EXPORT */ | 351 | # endif |
352 | # else | 352 | # else |
353 | # define EAPI __declspec(dllimport) | 353 | # define EAPI __declspec(dllimport) |
354 | # endif /* ! EFL_EMBRYO_BUILD */ | 354 | # endif |
355 | #else | 355 | #else |
356 | # ifdef __GNUC__ | 356 | # ifdef __GNUC__ |
357 | # if __GNUC__ >= 4 | 357 | # if __GNUC__ >= 4 |
@@ -362,7 +362,7 @@ This is the @e only file you need to include. | |||
362 | # else | 362 | # else |
363 | # define EAPI | 363 | # define EAPI |
364 | # endif | 364 | # endif |
365 | #endif /* ! _WIN32 */ | 365 | #endif |
366 | 366 | ||
367 | #ifdef __cplusplus | 367 | #ifdef __cplusplus |
368 | extern "C" { | 368 | extern "C" { |
diff --git a/src/lib/emile/Emile.h b/src/lib/emile/Emile.h index 03d8e53eb4..741905ef2f 100644 --- a/src/lib/emile/Emile.h +++ b/src/lib/emile/Emile.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #ifdef _WIN32 | 29 | #ifdef _WIN32 |
30 | # ifdef EFL_EMILE_BUILD | 30 | # ifdef EFL_BUILD |
31 | # ifdef DLL_EXPORT | 31 | # ifdef DLL_EXPORT |
32 | # define EAPI __declspec(dllexport) | 32 | # define EAPI __declspec(dllexport) |
33 | # else | 33 | # else |
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h index 6bd323453e..d7eef3c090 100644 --- a/src/lib/emotion/Emotion.h +++ b/src/lib/emotion/Emotion.h | |||
@@ -99,15 +99,15 @@ | |||
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | #ifdef _WIN32 | 101 | #ifdef _WIN32 |
102 | # ifdef EFL_EMOTION_BUILD | 102 | # ifdef EFL_BUILD |
103 | # ifdef DLL_EXPORT | 103 | # ifdef DLL_EXPORT |
104 | # define EAPI __declspec(dllexport) | 104 | # define EAPI __declspec(dllexport) |
105 | # else | 105 | # else |
106 | # define EAPI | 106 | # define EAPI |
107 | # endif /* ! DLL_EXPORT */ | 107 | # endif |
108 | # else | 108 | # else |
109 | # define EAPI __declspec(dllimport) | 109 | # define EAPI __declspec(dllimport) |
110 | # endif /* ! EFL_EMOTION_BUILD */ | 110 | # endif |
111 | #else | 111 | #else |
112 | # ifdef __GNUC__ | 112 | # ifdef __GNUC__ |
113 | # if __GNUC__ >= 4 | 113 | # if __GNUC__ >= 4 |
@@ -118,7 +118,7 @@ | |||
118 | # else | 118 | # else |
119 | # define EAPI | 119 | # define EAPI |
120 | # endif | 120 | # endif |
121 | #endif /* ! _WIN32 */ | 121 | #endif |
122 | 122 | ||
123 | #ifdef __cplusplus | 123 | #ifdef __cplusplus |
124 | extern "C" { | 124 | extern "C" { |
diff --git a/src/lib/emotion/emotion_modules.h b/src/lib/emotion/emotion_modules.h index d5dd1dd6a2..8e41121796 100644 --- a/src/lib/emotion/emotion_modules.h +++ b/src/lib/emotion/emotion_modules.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_EMOTION_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_EMOTION_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
@@ -27,7 +27,7 @@ | |||
27 | # else | 27 | # else |
28 | # define EAPI | 28 | # define EAPI |
29 | # endif | 29 | # endif |
30 | #endif /* ! _WIN32 */ | 30 | #endif |
31 | 31 | ||
32 | #define META_TRACK_TITLE 1 | 32 | #define META_TRACK_TITLE 1 |
33 | #define META_TRACK_ARTIST 2 | 33 | #define META_TRACK_ARTIST 2 |
@@ -163,4 +163,7 @@ EAPI const char *emotion_webcam_custom_get(const char *device); | |||
163 | EAPI Eina_Bool _emotion_module_register(const Emotion_Engine *api); | 163 | EAPI Eina_Bool _emotion_module_register(const Emotion_Engine *api); |
164 | EAPI Eina_Bool _emotion_module_unregister(const Emotion_Engine *api); | 164 | EAPI Eina_Bool _emotion_module_unregister(const Emotion_Engine *api); |
165 | 165 | ||
166 | #undef EAPI | ||
167 | #define EAPI | ||
168 | |||
166 | #endif | 169 | #endif |
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index a26e9fb7a6..441b3789fc 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h | |||
@@ -14,15 +14,15 @@ | |||
14 | #define EOAPI EAPI EAPI_WEAK | 14 | #define EOAPI EAPI EAPI_WEAK |
15 | 15 | ||
16 | #ifdef _WIN32 | 16 | #ifdef _WIN32 |
17 | # ifdef EFL_EO_BUILD | 17 | # ifdef EFL_BUILD |
18 | # ifdef DLL_EXPORT | 18 | # ifdef DLL_EXPORT |
19 | # define EAPI __declspec(dllexport) | 19 | # define EAPI __declspec(dllexport) |
20 | # else | 20 | # else |
21 | # define EAPI | 21 | # define EAPI |
22 | # endif /* ! DLL_EXPORT */ | 22 | # endif |
23 | # else | 23 | # else |
24 | # define EAPI __declspec(dllimport) | 24 | # define EAPI __declspec(dllimport) |
25 | # endif /* ! EFL_EO_BUILD */ | 25 | # endif |
26 | #else | 26 | #else |
27 | # ifdef __GNUC__ | 27 | # ifdef __GNUC__ |
28 | # if __GNUC__ >= 4 | 28 | # if __GNUC__ >= 4 |
@@ -33,7 +33,7 @@ | |||
33 | # else | 33 | # else |
34 | # define EAPI | 34 | # define EAPI |
35 | # endif | 35 | # endif |
36 | #endif /* ! _WIN32 */ | 36 | #endif |
37 | 37 | ||
38 | #ifdef __cplusplus | 38 | #ifdef __cplusplus |
39 | extern "C" { | 39 | extern "C" { |
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 2688dd71a8..bb67db9139 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_EOLIAN_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_EOLIAN_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -25,7 +25,7 @@ | |||
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif | 27 | # endif |
28 | #endif /* ! _WIN32 */ | 28 | #endif |
29 | 29 | ||
30 | #ifdef __cplusplus | 30 | #ifdef __cplusplus |
31 | extern "C" { | 31 | extern "C" { |
diff --git a/src/lib/ephysics/EPhysics.h b/src/lib/ephysics/EPhysics.h index f1c34244d3..2311975aab 100644 --- a/src/lib/ephysics/EPhysics.h +++ b/src/lib/ephysics/EPhysics.h | |||
@@ -72,15 +72,15 @@ | |||
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #ifdef _WIN32 | 74 | #ifdef _WIN32 |
75 | # ifdef EFL_EPHYSICS_BUILD | 75 | # ifdef EFL_BUILD |
76 | # ifdef DLL_EXPORT | 76 | # ifdef DLL_EXPORT |
77 | # define EAPI __declspec(dllexport) | 77 | # define EAPI __declspec(dllexport) |
78 | # else | 78 | # else |
79 | # define EAPI | 79 | # define EAPI |
80 | # endif /* ! DLL_EXPORT */ | 80 | # endif |
81 | # else | 81 | # else |
82 | # define EAPI __declspec(dllimport) | 82 | # define EAPI __declspec(dllimport) |
83 | # endif /* ! EFL_EPHYSICS_BUILD */ | 83 | # endif |
84 | #else | 84 | #else |
85 | # ifdef __GNUC__ | 85 | # ifdef __GNUC__ |
86 | # if __GNUC__ >= 4 | 86 | # if __GNUC__ >= 4 |
@@ -91,7 +91,7 @@ | |||
91 | # else | 91 | # else |
92 | # define EAPI | 92 | # define EAPI |
93 | # endif | 93 | # endif |
94 | #endif /* ! _WIN32 */ | 94 | #endif |
95 | 95 | ||
96 | #ifdef __cplusplus | 96 | #ifdef __cplusplus |
97 | extern "C" { | 97 | extern "C" { |
diff --git a/src/lib/ethumb/Ethumb.h b/src/lib/ethumb/Ethumb.h index 2e497e19e8..9d3357d824 100644 --- a/src/lib/ethumb/Ethumb.h +++ b/src/lib/ethumb/Ethumb.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_ETHUMB_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_ETHUMB_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | #ifdef __cplusplus | 33 | #ifdef __cplusplus |
34 | extern "C" { | 34 | extern "C" { |
diff --git a/src/lib/ethumb/Ethumb_Plugin.h b/src/lib/ethumb/Ethumb_Plugin.h index 3dd7c57a89..6bdc38a268 100644 --- a/src/lib/ethumb/Ethumb_Plugin.h +++ b/src/lib/ethumb/Ethumb_Plugin.h | |||
@@ -10,15 +10,15 @@ | |||
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_ETHUMB_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
17 | # define EAPI | 17 | # define EAPI |
18 | # endif /* ! DLL_EXPORT */ | 18 | # endif |
19 | # else | 19 | # else |
20 | # define EAPI __declspec(dllimport) | 20 | # define EAPI __declspec(dllimport) |
21 | # endif /* ! EFL_ETHUMB_BUILD */ | 21 | # endif |
22 | #else | 22 | #else |
23 | # ifdef __GNUC__ | 23 | # ifdef __GNUC__ |
24 | # if __GNUC__ >= 4 | 24 | # if __GNUC__ >= 4 |
@@ -29,7 +29,7 @@ | |||
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif | 31 | # endif |
32 | #endif /* ! _WIN32 */ | 32 | #endif |
33 | 33 | ||
34 | #ifdef __cplusplus | 34 | #ifdef __cplusplus |
35 | extern "C" { | 35 | extern "C" { |
diff --git a/src/lib/ethumb/ethumb_private.h b/src/lib/ethumb/ethumb_private.h index 32e42ac716..47dba6e0ff 100644 --- a/src/lib/ethumb/ethumb_private.h +++ b/src/lib/ethumb/ethumb_private.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_ETHUMB_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_ETHUMB_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | typedef struct _Ethumb_Frame Ethumb_Frame; | 33 | typedef struct _Ethumb_Frame Ethumb_Frame; |
34 | 34 | ||
@@ -80,4 +80,7 @@ struct _Ethumb | |||
80 | Ethumb_Plugin *plugin; | 80 | Ethumb_Plugin *plugin; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | #undef EAPI | ||
84 | #define EAPI | ||
85 | |||
83 | #endif /* __ETHUMB_PRIVATE_H__ */ | 86 | #endif /* __ETHUMB_PRIVATE_H__ */ |
diff --git a/src/lib/ethumb_client/Ethumb_Client.h b/src/lib/ethumb_client/Ethumb_Client.h index 1ec8178c37..c8d90b230d 100644 --- a/src/lib/ethumb_client/Ethumb_Client.h +++ b/src/lib/ethumb_client/Ethumb_Client.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_ETHUMB_CLIENT_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_ETHUMB_CLIENT_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
@@ -27,7 +27,7 @@ | |||
27 | # else | 27 | # else |
28 | # define EAPI | 28 | # define EAPI |
29 | # endif | 29 | # endif |
30 | #endif /* ! _WIN32 */ | 30 | #endif |
31 | 31 | ||
32 | #ifdef __cplusplus | 32 | #ifdef __cplusplus |
33 | extern "C" { | 33 | extern "C" { |
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h index 81df72cba2..ad3f16fe4a 100644 --- a/src/lib/evas/Evas.h +++ b/src/lib/evas/Evas.h | |||
@@ -180,15 +180,15 @@ | |||
180 | #endif | 180 | #endif |
181 | 181 | ||
182 | #ifdef _WIN32 | 182 | #ifdef _WIN32 |
183 | # ifdef EFL_EVAS_BUILD | 183 | # ifdef EFL_BUILD |
184 | # ifdef DLL_EXPORT | 184 | # ifdef DLL_EXPORT |
185 | # define EAPI __declspec(dllexport) | 185 | # define EAPI __declspec(dllexport) |
186 | # else | 186 | # else |
187 | # define EAPI | 187 | # define EAPI |
188 | # endif /* ! DLL_EXPORT */ | 188 | # endif |
189 | # else | 189 | # else |
190 | # define EAPI __declspec(dllimport) | 190 | # define EAPI __declspec(dllimport) |
191 | # endif /* ! EFL_EVAS_BUILD */ | 191 | # endif |
192 | #else | 192 | #else |
193 | # ifdef __GNUC__ | 193 | # ifdef __GNUC__ |
194 | # if __GNUC__ >= 4 | 194 | # if __GNUC__ >= 4 |
@@ -199,7 +199,7 @@ | |||
199 | # else | 199 | # else |
200 | # define EAPI | 200 | # define EAPI |
201 | # endif | 201 | # endif |
202 | #endif /* ! _WIN32 */ | 202 | #endif |
203 | 203 | ||
204 | #ifdef __cplusplus | 204 | #ifdef __cplusplus |
205 | extern "C" { | 205 | extern "C" { |
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h index abc03ef267..fa3e6f4fe4 100644 --- a/src/lib/evas/Evas_GL.h +++ b/src/lib/evas/Evas_GL.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_EVAS_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_EVAS_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | #ifdef __cplusplus | 33 | #ifdef __cplusplus |
34 | extern "C" { | 34 | extern "C" { |
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h index a8a0361a9d..4e5655bd23 100644 --- a/src/lib/evas/Evas_Internal.h +++ b/src/lib/evas/Evas_Internal.h | |||
@@ -7,15 +7,15 @@ | |||
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | #ifdef _WIN32 | 9 | #ifdef _WIN32 |
10 | # ifdef EFL_EVAS_BUILD | 10 | # ifdef EFL_BUILD |
11 | # ifdef DLL_EXPORT | 11 | # ifdef DLL_EXPORT |
12 | # define EAPI __declspec(dllexport) | 12 | # define EAPI __declspec(dllexport) |
13 | # else | 13 | # else |
14 | # define EAPI | 14 | # define EAPI |
15 | # endif /* ! DLL_EXPORT */ | 15 | # endif |
16 | # else | 16 | # else |
17 | # define EAPI __declspec(dllimport) | 17 | # define EAPI __declspec(dllimport) |
18 | # endif /* ! EFL_EVAS_BUILD */ | 18 | # endif |
19 | #else | 19 | #else |
20 | # ifdef __GNUC__ | 20 | # ifdef __GNUC__ |
21 | # if __GNUC__ >= 4 | 21 | # if __GNUC__ >= 4 |
@@ -26,7 +26,7 @@ | |||
26 | # else | 26 | # else |
27 | # define EAPI | 27 | # define EAPI |
28 | # endif | 28 | # endif |
29 | #endif /* ! _WIN32 */ | 29 | #endif |
30 | 30 | ||
31 | #ifdef __cplusplus | 31 | #ifdef __cplusplus |
32 | extern "C" { | 32 | extern "C" { |
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h index 3c52dc3201..f8741498bb 100644 --- a/src/lib/evas/Evas_Loader.h +++ b/src/lib/evas/Evas_Loader.h | |||
@@ -44,15 +44,15 @@ | |||
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #ifdef _WIN32 | 46 | #ifdef _WIN32 |
47 | # ifdef EFL_EVAS_BUILD | 47 | # ifdef EFL_BUILD |
48 | # ifdef DLL_EXPORT | 48 | # ifdef DLL_EXPORT |
49 | # define EAPI __declspec(dllexport) | 49 | # define EAPI __declspec(dllexport) |
50 | # else | 50 | # else |
51 | # define EAPI | 51 | # define EAPI |
52 | # endif /* ! DLL_EXPORT */ | 52 | # endif |
53 | # else | 53 | # else |
54 | # define EAPI __declspec(dllimport) | 54 | # define EAPI __declspec(dllimport) |
55 | # endif /* ! EFL_EVAS_BUILD */ | 55 | # endif |
56 | #else | 56 | #else |
57 | # ifdef __GNUC__ | 57 | # ifdef __GNUC__ |
58 | # if __GNUC__ >= 4 | 58 | # if __GNUC__ >= 4 |
@@ -63,7 +63,7 @@ | |||
63 | # else | 63 | # else |
64 | # define EAPI | 64 | # define EAPI |
65 | # endif | 65 | # endif |
66 | #endif /* ! _WIN32 */ | 66 | #endif |
67 | 67 | ||
68 | #ifdef __cplusplus | 68 | #ifdef __cplusplus |
69 | extern "C" { | 69 | extern "C" { |
diff --git a/src/lib/evas/common/evas_font.h b/src/lib/evas/common/evas_font.h index 1a010bfe05..246fe5a3cb 100644 --- a/src/lib/evas/common/evas_font.h +++ b/src/lib/evas/common/evas_font.h | |||
@@ -27,15 +27,15 @@ typedef unsigned long long DATA64; | |||
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #ifdef _WIN32 | 29 | #ifdef _WIN32 |
30 | # ifdef EFL_EVAS_BUILD | 30 | # ifdef EFL_BUILD |
31 | # ifdef DLL_EXPORT | 31 | # ifdef DLL_EXPORT |
32 | # define EAPI __declspec(dllexport) | 32 | # define EAPI __declspec(dllexport) |
33 | # else | 33 | # else |
34 | # define EAPI | 34 | # define EAPI |
35 | # endif /* ! DLL_EXPORT */ | 35 | # endif |
36 | # else | 36 | # else |
37 | # define EAPI __declspec(dllimport) | 37 | # define EAPI __declspec(dllimport) |
38 | # endif /* ! EFL_EVAS_BUILD */ | 38 | # endif |
39 | #else | 39 | #else |
40 | # ifdef __GNUC__ | 40 | # ifdef __GNUC__ |
41 | # if __GNUC__ >= 4 | 41 | # if __GNUC__ >= 4 |
@@ -46,7 +46,7 @@ typedef unsigned long long DATA64; | |||
46 | # else | 46 | # else |
47 | # define EAPI | 47 | # define EAPI |
48 | # endif | 48 | # endif |
49 | #endif /* ! _WIN32 */ | 49 | #endif |
50 | 50 | ||
51 | #define LK(x) Eina_Lock x | 51 | #define LK(x) Eina_Lock x |
52 | #define LKI(x) eina_lock_new(&(x)) | 52 | #define LKI(x) eina_lock_new(&(x)) |
diff --git a/src/lib/evas/cserve2/evas_cs2_private.h b/src/lib/evas/cserve2/evas_cs2_private.h index 9412a7d633..70448321f7 100644 --- a/src/lib/evas/cserve2/evas_cs2_private.h +++ b/src/lib/evas/cserve2/evas_cs2_private.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef _WIN32 | 11 | #ifdef _WIN32 |
12 | # ifdef EFL_EVAS_BUILD | 12 | # ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
16 | # define EAPI | 16 | # define EAPI |
17 | # endif /* ! DLL_EXPORT */ | 17 | # endif |
18 | # else | 18 | # else |
19 | # define EAPI __declspec(dllimport) | 19 | # define EAPI __declspec(dllimport) |
20 | # endif /* ! EFL_EVAS_BUILD */ | 20 | # endif |
21 | #else | 21 | #else |
22 | # ifdef __GNUC__ | 22 | # ifdef __GNUC__ |
23 | # if __GNUC__ >= 4 | 23 | # if __GNUC__ >= 4 |
@@ -28,7 +28,7 @@ | |||
28 | # else | 28 | # else |
29 | # define EAPI | 29 | # define EAPI |
30 | # endif | 30 | # endif |
31 | #endif /* ! _WIN32 */ | 31 | #endif |
32 | 32 | ||
33 | #define SHARED_BUFFER_PATH_MAX 64 | 33 | #define SHARED_BUFFER_PATH_MAX 64 |
34 | typedef struct _Data_Entry Data_Entry; | 34 | typedef struct _Data_Entry Data_Entry; |
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h index 27332c0c67..6b1e15f25d 100644 --- a/src/lib/evas/include/evas_common_private.h +++ b/src/lib/evas/include/evas_common_private.h | |||
@@ -67,15 +67,15 @@ | |||
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | #ifdef _WIN32 | 69 | #ifdef _WIN32 |
70 | # ifdef EFL_EVAS_BUILD | 70 | # ifdef EFL_BUILD |
71 | # ifdef DLL_EXPORT | 71 | # ifdef DLL_EXPORT |
72 | # define EAPI __declspec(dllexport) | 72 | # define EAPI __declspec(dllexport) |
73 | # else | 73 | # else |
74 | # define EAPI | 74 | # define EAPI |
75 | # endif /* ! DLL_EXPORT */ | 75 | # endif |
76 | # else | 76 | # else |
77 | # define EAPI __declspec(dllimport) | 77 | # define EAPI __declspec(dllimport) |
78 | # endif /* ! EFL_EVAS_BUILD */ | 78 | # endif |
79 | #else | 79 | #else |
80 | # ifdef __GNUC__ | 80 | # ifdef __GNUC__ |
81 | # if __GNUC__ >= 4 | 81 | # if __GNUC__ >= 4 |
@@ -86,7 +86,7 @@ | |||
86 | # else | 86 | # else |
87 | # define EAPI | 87 | # define EAPI |
88 | # endif | 88 | # endif |
89 | #endif /* ! _WIN32 */ | 89 | #endif |
90 | 90 | ||
91 | #ifndef HAVE_LROUND | 91 | #ifndef HAVE_LROUND |
92 | /* right now i dont care about rendering bugs on platforms without lround | 92 | /* right now i dont care about rendering bugs on platforms without lround |
diff --git a/src/lib/evas/include/evas_filter.h b/src/lib/evas/include/evas_filter.h index c6618d35d6..ffbe797a6d 100644 --- a/src/lib/evas/include/evas_filter.h +++ b/src/lib/evas/include/evas_filter.h | |||
@@ -11,15 +11,15 @@ | |||
11 | #endif | 11 | #endif |
12 | 12 | ||
13 | #ifdef _WIN32 | 13 | #ifdef _WIN32 |
14 | # ifdef EFL_EVAS_BUILD | 14 | # ifdef EFL_BUILD |
15 | # ifdef DLL_EXPORT | 15 | # ifdef DLL_EXPORT |
16 | # define EAPI __declspec(dllexport) | 16 | # define EAPI __declspec(dllexport) |
17 | # else | 17 | # else |
18 | # define EAPI | 18 | # define EAPI |
19 | # endif /* ! DLL_EXPORT */ | 19 | # endif |
20 | # else | 20 | # else |
21 | # define EAPI __declspec(dllimport) | 21 | # define EAPI __declspec(dllimport) |
22 | # endif /* ! EFL_EVAS_BUILD */ | 22 | # endif |
23 | #else | 23 | #else |
24 | # ifdef __GNUC__ | 24 | # ifdef __GNUC__ |
25 | # if __GNUC__ >= 4 | 25 | # if __GNUC__ >= 4 |
@@ -30,7 +30,7 @@ | |||
30 | # else | 30 | # else |
31 | # define EAPI | 31 | # define EAPI |
32 | # endif | 32 | # endif |
33 | #endif /* ! _WIN32 */ | 33 | #endif |
34 | 34 | ||
35 | #ifdef DEBUG | 35 | #ifdef DEBUG |
36 | # define FILTERS_DEBUG | 36 | # define FILTERS_DEBUG |
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index 7c43a64295..51d4b953ae 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h | |||
@@ -23,15 +23,15 @@ | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #ifdef _WIN32 | 25 | #ifdef _WIN32 |
26 | # ifdef EFL_EVAS_BUILD | 26 | # ifdef EFL_BUILD |
27 | # ifdef DLL_EXPORT | 27 | # ifdef DLL_EXPORT |
28 | # define EAPI __declspec(dllexport) | 28 | # define EAPI __declspec(dllexport) |
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif /* ! DLL_EXPORT */ | 31 | # endif |
32 | # else | 32 | # else |
33 | # define EAPI __declspec(dllimport) | 33 | # define EAPI __declspec(dllimport) |
34 | # endif /* ! EFL_EVAS_BUILD */ | 34 | # endif |
35 | #else | 35 | #else |
36 | # ifdef __GNUC__ | 36 | # ifdef __GNUC__ |
37 | # if __GNUC__ >= 4 | 37 | # if __GNUC__ >= 4 |
@@ -42,7 +42,7 @@ | |||
42 | # else | 42 | # else |
43 | # define EAPI | 43 | # define EAPI |
44 | # endif | 44 | # endif |
45 | #endif /* ! _WIN32 */ | 45 | #endif |
46 | 46 | ||
47 | /* save typing */ | 47 | /* save typing */ |
48 | #define ENFN obj->layer->evas->engine.func | 48 | #define ENFN obj->layer->evas->engine.func |
diff --git a/src/lib/evil/evil_macro.h b/src/lib/evil/evil_macro.h index 966710ca4f..88cec3dcf8 100644 --- a/src/lib/evil/evil_macro.h +++ b/src/lib/evil/evil_macro.h | |||
@@ -9,7 +9,7 @@ | |||
9 | # undef EAPI | 9 | # undef EAPI |
10 | #endif | 10 | #endif |
11 | 11 | ||
12 | #ifdef EFL_EVIL_BUILD | 12 | #ifdef EFL_BUILD |
13 | # ifdef DLL_EXPORT | 13 | # ifdef DLL_EXPORT |
14 | # define EAPI __declspec(dllexport) | 14 | # define EAPI __declspec(dllexport) |
15 | # else | 15 | # else |
diff --git a/src/lib/evil/fnmatch.h b/src/lib/evil/fnmatch.h index f2a9266e53..0464fa7ef6 100644 --- a/src/lib/evil/fnmatch.h +++ b/src/lib/evil/fnmatch.h | |||
@@ -3,19 +3,19 @@ | |||
3 | 3 | ||
4 | #ifdef EAPI | 4 | #ifdef EAPI |
5 | # undef EAPI | 5 | # undef EAPI |
6 | #endif /* EAPI */ | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_EVIL_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_EVIL_BUILD */ | 17 | # endif |
18 | #endif /* _WIN32 */ | 18 | #endif |
19 | 19 | ||
20 | #ifdef __cplusplus | 20 | #ifdef __cplusplus |
21 | extern "C" { | 21 | extern "C" { |
@@ -51,4 +51,7 @@ EAPI int fnmatch(const char *__pattern, const char *__string, int __flags); | |||
51 | } | 51 | } |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #undef EAPI | ||
55 | #define EAPI | ||
56 | |||
54 | #endif /* __EVIL_FNMATCH_H__ */ | 57 | #endif /* __EVIL_FNMATCH_H__ */ |
diff --git a/src/lib/evil/pwd.h b/src/lib/evil/pwd.h index fd422eb0ad..2d303381b7 100644 --- a/src/lib/evil/pwd.h +++ b/src/lib/evil/pwd.h | |||
@@ -20,10 +20,10 @@ | |||
20 | 20 | ||
21 | #ifdef EAPI | 21 | #ifdef EAPI |
22 | # undef EAPI | 22 | # undef EAPI |
23 | #endif /* EAPI */ | 23 | #endif |
24 | 24 | ||
25 | #ifdef _WIN32 | 25 | #ifdef _WIN32 |
26 | # ifdef EFL_EVIL_BUILD | 26 | # ifdef EFL_BUILD |
27 | # ifdef DLL_EXPORT | 27 | # ifdef DLL_EXPORT |
28 | # define EAPI __declspec(dllexport) | 28 | # define EAPI __declspec(dllexport) |
29 | # else | 29 | # else |
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h index 508c757dde..a56dddb719 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h | |||
@@ -79,15 +79,15 @@ typedef Eina_Bool (*evas_gl_make_current_cb)(void *engine_data, void *doit); | |||
79 | #endif | 79 | #endif |
80 | 80 | ||
81 | #ifdef _WIN32 | 81 | #ifdef _WIN32 |
82 | # ifdef EFL_EVAS_BUILD | 82 | # ifdef EFL_BUILD |
83 | # ifdef DLL_EXPORT | 83 | # ifdef DLL_EXPORT |
84 | # define EAPI __declspec(dllexport) | 84 | # define EAPI __declspec(dllexport) |
85 | # else | 85 | # else |
86 | # define EAPI | 86 | # define EAPI |
87 | # endif /* ! DLL_EXPORT */ | 87 | # endif |
88 | # else | 88 | # else |
89 | # define EAPI __declspec(dllimport) | 89 | # define EAPI __declspec(dllimport) |
90 | # endif /* ! EFL_EVAS_BUILD */ | 90 | # endif |
91 | #else | 91 | #else |
92 | # ifdef __GNUC__ | 92 | # ifdef __GNUC__ |
93 | # if __GNUC__ >= 4 | 93 | # if __GNUC__ >= 4 |
@@ -98,7 +98,7 @@ typedef Eina_Bool (*evas_gl_make_current_cb)(void *engine_data, void *doit); | |||
98 | # else | 98 | # else |
99 | # define EAPI | 99 | # define EAPI |
100 | # endif | 100 | # endif |
101 | #endif /* ! _WIN32 */ | 101 | #endif |
102 | 102 | ||
103 | #define PROGRAM_HITCOUNT_MAX 0x1000000 | 103 | #define PROGRAM_HITCOUNT_MAX 0x1000000 |
104 | 104 | ||
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.h b/src/modules/evas/engines/gl_common/evas_gl_core.h index 8083236c37..7aead8dd96 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_core.h +++ b/src/modules/evas/engines/gl_common/evas_gl_core.h | |||
@@ -8,15 +8,15 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
11 | # ifdef EFL_EVAS_BUILD | 11 | # ifdef EFL_BUILD |
12 | # ifdef DLL_EXPORT | 12 | # ifdef DLL_EXPORT |
13 | # define EAPI __declspec(dllexport) | 13 | # define EAPI __declspec(dllexport) |
14 | # else | 14 | # else |
15 | # define EAPI | 15 | # define EAPI |
16 | # endif /* ! DLL_EXPORT */ | 16 | # endif |
17 | # else | 17 | # else |
18 | # define EAPI __declspec(dllimport) | 18 | # define EAPI __declspec(dllimport) |
19 | # endif /* ! EFL_EVAS_BUILD */ | 19 | # endif |
20 | #else | 20 | #else |
21 | # ifdef __GNUC__ | 21 | # ifdef __GNUC__ |
22 | # if __GNUC__ >= 4 | 22 | # if __GNUC__ >= 4 |
@@ -27,7 +27,7 @@ | |||
27 | # else | 27 | # else |
28 | # define EAPI | 28 | # define EAPI |
29 | # endif | 29 | # endif |
30 | #endif /* ! _WIN32 */ | 30 | #endif |
31 | 31 | ||
32 | typedef void *EVGLNative_Display; | 32 | typedef void *EVGLNative_Display; |
33 | typedef void *EVGLNative_Window; | 33 | typedef void *EVGLNative_Window; |
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl.h b/src/modules/evas/engines/gl_generic/evas_ector_gl.h index 49d9673934..6e4c46e5fc 100644 --- a/src/modules/evas/engines/gl_generic/evas_ector_gl.h +++ b/src/modules/evas/engines/gl_generic/evas_ector_gl.h | |||
@@ -4,15 +4,15 @@ | |||
4 | #undef EAPI | 4 | #undef EAPI |
5 | 5 | ||
6 | #ifdef _WIN32 | 6 | #ifdef _WIN32 |
7 | # ifdef EFL_EVAS_BUILD | 7 | # ifdef EFL_BUILD |
8 | # ifdef DLL_EXPORT | 8 | # ifdef DLL_EXPORT |
9 | # define EAPI __declspec(dllexport) | 9 | # define EAPI __declspec(dllexport) |
10 | # else | 10 | # else |
11 | # define EAPI | 11 | # define EAPI |
12 | # endif /* ! DLL_EXPORT */ | 12 | # endif |
13 | # else | 13 | # else |
14 | # define EAPI __declspec(dllimport) | 14 | # define EAPI __declspec(dllimport) |
15 | # endif /* ! EFL_EVAS_BUILD */ | 15 | # endif |
16 | #else | 16 | #else |
17 | # ifdef __GNUC__ | 17 | # ifdef __GNUC__ |
18 | # if __GNUC__ >= 4 | 18 | # if __GNUC__ >= 4 |
@@ -23,7 +23,7 @@ | |||
23 | # else | 23 | # else |
24 | # define EAPI | 24 | # define EAPI |
25 | # endif | 25 | # endif |
26 | #endif /* ! _WIN32 */ | 26 | #endif |
27 | 27 | ||
28 | #include "evas_ector_buffer.eo.h" | 28 | #include "evas_ector_buffer.eo.h" |
29 | #include "evas_ector_gl_buffer.eo.h" | 29 | #include "evas_ector_gl_buffer.eo.h" |
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software.h b/src/modules/evas/engines/software_generic/evas_ector_software.h index 5d10143cc4..4b2385cc3a 100644 --- a/src/modules/evas/engines/software_generic/evas_ector_software.h +++ b/src/modules/evas/engines/software_generic/evas_ector_software.h | |||
@@ -1,18 +1,20 @@ | |||
1 | #ifndef EVAS_ECTOR_GL_H | 1 | #ifndef EVAS_ECTOR_GL_H |
2 | #define EVAS_ECTOR_GL_H | 2 | #define EVAS_ECTOR_GL_H |
3 | 3 | ||
4 | #undef EAPI | 4 | #ifdef EAPI |
5 | # undef EAPI | ||
6 | #endif | ||
5 | 7 | ||
6 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
7 | # ifdef EFL_EVAS_BUILD | 9 | # ifdef EFL_BUILD |
8 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
9 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
10 | # else | 12 | # else |
11 | # define EAPI | 13 | # define EAPI |
12 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
13 | # else | 15 | # else |
14 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
15 | # endif /* ! EFL_EVAS_BUILD */ | 17 | # endif |
16 | #else | 18 | #else |
17 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
18 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -23,7 +25,7 @@ | |||
23 | # else | 25 | # else |
24 | # define EAPI | 26 | # define EAPI |
25 | # endif | 27 | # endif |
26 | #endif /* ! _WIN32 */ | 28 | #endif |
27 | 29 | ||
28 | #include "evas_ector_buffer.eo.h" | 30 | #include "evas_ector_buffer.eo.h" |
29 | #include "evas_ector_software_buffer.eo.h" | 31 | #include "evas_ector_software_buffer.eo.h" |
diff --git a/src/modules/evas/engines/software_generic/evas_native_common.h b/src/modules/evas/engines/software_generic/evas_native_common.h index de3533550d..4121746fd7 100644 --- a/src/modules/evas/engines/software_generic/evas_native_common.h +++ b/src/modules/evas/engines/software_generic/evas_native_common.h | |||
@@ -6,15 +6,15 @@ | |||
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifdef _WIN32 | 8 | #ifdef _WIN32 |
9 | # ifdef EFL_EVAS_BUILD | 9 | # ifdef EFL_BUILD |
10 | # ifdef DLL_EXPORT | 10 | # ifdef DLL_EXPORT |
11 | # define EAPI __declspec(dllexport) | 11 | # define EAPI __declspec(dllexport) |
12 | # else | 12 | # else |
13 | # define EAPI | 13 | # define EAPI |
14 | # endif /* ! DLL_EXPORT */ | 14 | # endif |
15 | # else | 15 | # else |
16 | # define EAPI __declspec(dllimport) | 16 | # define EAPI __declspec(dllimport) |
17 | # endif /* ! EFL_EVAS_BUILD */ | 17 | # endif |
18 | #else | 18 | #else |
19 | # ifdef __GNUC__ | 19 | # ifdef __GNUC__ |
20 | # if __GNUC__ >= 4 | 20 | # if __GNUC__ >= 4 |
@@ -25,7 +25,7 @@ | |||
25 | # else | 25 | # else |
26 | # define EAPI | 26 | # define EAPI |
27 | # endif | 27 | # endif |
28 | #endif /* ! _WIN32 */ | 28 | #endif |
29 | 29 | ||
30 | //#include <Evas_Common.h> | 30 | //#include <Evas_Common.h> |
31 | 31 | ||
diff --git a/src/tests/efl_mono/libefl_mono_native_test.c b/src/tests/efl_mono/libefl_mono_native_test.c index eedc12fac7..f9b50dce26 100644 --- a/src/tests/efl_mono/libefl_mono_native_test.c +++ b/src/tests/efl_mono/libefl_mono_native_test.c | |||
@@ -10,15 +10,15 @@ | |||
10 | #define EOAPI EAPI EAPI_WEAK | 10 | #define EOAPI EAPI EAPI_WEAK |
11 | 11 | ||
12 | #ifdef _WIN32 | 12 | #ifdef _WIN32 |
13 | # ifdef EFL_EO_BUILD | 13 | # ifdef EFL_BUILD |
14 | # ifdef DLL_EXPORT | 14 | # ifdef DLL_EXPORT |
15 | # define EAPI __declspec(dllexport) | 15 | # define EAPI __declspec(dllexport) |
16 | # else | 16 | # else |
17 | # define EAPI | 17 | # define EAPI |
18 | # endif /* ! DLL_EXPORT */ | 18 | # endif |
19 | # else | 19 | # else |
20 | # define EAPI __declspec(dllimport) | 20 | # define EAPI __declspec(dllimport) |
21 | # endif /* ! EFL_EO_BUILD */ | 21 | # endif |
22 | #else | 22 | #else |
23 | # ifdef __GNUC__ | 23 | # ifdef __GNUC__ |
24 | # if __GNUC__ >= 4 | 24 | # if __GNUC__ >= 4 |
@@ -29,7 +29,7 @@ | |||
29 | # else | 29 | # else |
30 | # define EAPI | 30 | # define EAPI |
31 | # endif | 31 | # endif |
32 | #endif /* ! _WIN32 */ | 32 | #endif |
33 | 33 | ||
34 | #include "test_numberwrapper.eo.h" | 34 | #include "test_numberwrapper.eo.h" |
35 | #include "test_testing.eo.h" | 35 | #include "test_testing.eo.h" |