summaryrefslogtreecommitdiff
path: root/src/lib/efl
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-26 15:44:41 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-26 15:46:25 +0100
commit39b48ca430d635a5c7d9c3e1074003b252f8e86b (patch)
treea2dbea9eb07cecb874a171a63db385615d86baa5 /src/lib/efl
parent26ea0eaac2a55da5417795babc29d2927005e9fc (diff)
Revert "fix warnings about redefinting EWAPI etc. due to windows EAPI changes"
This reverts commit e2d6691d524e15b0b0673d121e81c0544271617b. This reverts commit c02b796fdb0960411b24576f654a03f0e765a842. This reverts commit 6c969f6b7d59e64e8bdf09a5e535de9561d77535. This reverts commit 74204bccd724fe9dee428056d4710f37bbc2cffb. This reverts commit 1304d9571775ef740ac6b8978ea4a2025a52c99a. This reverts commit 7c85be9674eaa0362b88f01c61107aa6e7c383a2. revert the EAPI changes that break cxx bindings build. sorry :( more fixes needed than i thought
Diffstat (limited to 'src/lib/efl')
-rw-r--r--src/lib/efl/Efl.h70
-rw-r--r--src/lib/efl/Efl_MVVM_Common.h30
-rw-r--r--src/lib/efl/efl_api.h32
-rw-r--r--src/lib/efl/interfaces/efl_file.c8
-rw-r--r--src/lib/efl/interfaces/efl_file.h8
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c4
-rw-r--r--src/lib/efl/interfaces/efl_mvvm_common.c32
-rw-r--r--src/lib/efl/interfaces/efl_observer.c2
-rw-r--r--src/lib/efl/interfaces/meson.build3
-rw-r--r--src/lib/efl/meson.build5
10 files changed, 99 insertions, 95 deletions
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 8d52ad20e2..480249fae5 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -7,7 +7,44 @@ extern "C" {
7 7
8#include <Eo.h> 8#include <Eo.h>
9 9
10#include <efl_api.h> 10#ifdef EAPI
11# undef EAPI
12#endif
13#ifdef EWAPI
14# undef EWAPI
15#endif
16#ifdef EOAPI
17# undef EOAPI
18#endif
19
20#ifdef _WIN32
21# ifdef EFL_BUILD
22# ifdef DLL_EXPORT
23# define EAPI __declspec(dllexport)
24# else
25# define EAPI
26# endif
27# else
28# define EAPI __declspec(dllimport)
29# endif
30# define EAPI_WEAK
31#else
32# ifdef __GNUC__
33# if __GNUC__ >= 4
34# define EAPI __attribute__ ((visibility("default")))
35# define EAPI_WEAK __attribute__ ((weak))
36# else
37# define EAPI
38# define EAPI_WEAK
39# endif
40# else
41# define EAPI
42# define EAPI_WEAK
43# endif
44#endif
45
46#define EWAPI EAPI EAPI_WEAK
47#define EOAPI EAPI EAPI_WEAK
11 48
12#define EFL_VERSION_1_18 1 49#define EFL_VERSION_1_18 1
13#define EFL_VERSION_1_19 1 50#define EFL_VERSION_1_19 1
@@ -46,39 +83,39 @@ typedef struct _Efl_Text_Attribute_Handle Efl_Text_Attribute_Handle;
46 83
47#ifdef EFL_BETA_API_SUPPORT 84#ifdef EFL_BETA_API_SUPPORT
48/** No error on load */ 85/** No error on load */
49EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_NONE; 86extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_NONE;
50 87
51/** A non-specific error occurred */ 88/** A non-specific error occurred */
52EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_GENERIC; 89extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
53 90
54/** File (or file path) does not exist */ 91/** File (or file path) does not exist */
55EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST; 92extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST;
56 93
57/** Permission denied to an existing file (or path) */ 94/** Permission denied to an existing file (or path) */
58EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED; 95extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED;
59 96
60/** Allocation of resources failure prevented load */ 97/** Allocation of resources failure prevented load */
61EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; 98extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
62 99
63/** File corrupt (but was detected as a known format) */ 100/** File corrupt (but was detected as a known format) */
64EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE; 101extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE;
65 102
66/** File is not a known format */ 103/** File is not a known format */
67EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT; 104extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT;
68 105
69/** Reading operation has been cancelled during decoding */ 106/** Reading operation has been cancelled during decoding */
70EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED; 107extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED;
71 108
72/** (Edje only) The file pointed to is incompatible, i.e., it doesn't 109/** (Edje only) The file pointed to is incompatible, i.e., it doesn't
73 * match the library's current version's format. */ 110 * match the library's current version's format. */
74EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE; 111extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE;
75 112
76/** (Edje only) The group/collection set to load from was not found in the file */ 113/** (Edje only) The group/collection set to load from was not found in the file */
77EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION; 114extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION;
78 115
79/** (Edje only) The group/collection set to load from had recursive references 116/** (Edje only) The group/collection set to load from had recursive references
80 * on its components */ 117 * on its components */
81EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE; 118extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE;
82#endif /* EFL_BETA_API_SUPPORT */ 119#endif /* EFL_BETA_API_SUPPORT */
83 120
84#include "interfaces/efl_gfx_types.eot.h" 121#include "interfaces/efl_gfx_types.eot.h"
@@ -194,11 +231,11 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
194 * 231 *
195 * @since 1.21 232 * @since 1.21
196 */ 233 */
197EFL_API Efl_Object *efl_part(const Eo *obj, const char *name); 234EAPI Efl_Object *efl_part(const Eo *obj, const char *name);
198 235
199#ifdef EFL_BETA_API_SUPPORT 236#ifdef EFL_BETA_API_SUPPORT
200 237
201EFL_API void efl_observable_tuple_free(Efl_Observable_Tuple *tuple); 238EAPI void efl_observable_tuple_free(Efl_Observable_Tuple *tuple);
202 239
203 240
204 241
@@ -305,10 +342,13 @@ efl_config_string_get(const Efl_Config *obj, const char *name)
305#endif 342#endif
306 343
307/* work-around bug in gcc --as-needed link optimization */ 344/* work-around bug in gcc --as-needed link optimization */
308EFL_API void __efl_internal_init(void); 345EAPI void __efl_internal_init(void);
309 346
310#if defined ( __cplusplus ) 347#if defined ( __cplusplus )
311} 348}
312#endif 349#endif
313 350
351#undef EAPI
352#define EAPI
353
314#endif 354#endif
diff --git a/src/lib/efl/Efl_MVVM_Common.h b/src/lib/efl/Efl_MVVM_Common.h
index 6dcb74b9d1..d928fa55c1 100644
--- a/src/lib/efl/Efl_MVVM_Common.h
+++ b/src/lib/efl/Efl_MVVM_Common.h
@@ -3,22 +3,22 @@
3 3
4#include <Eina.h> 4#include <Eina.h>
5 5
6EFL_API extern Eina_Error EFL_MODEL_ERROR_UNKNOWN; 6EAPI extern Eina_Error EFL_MODEL_ERROR_UNKNOWN;
7EFL_API extern Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED; 7EAPI extern Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED;
8EFL_API extern Eina_Error EFL_MODEL_ERROR_NOT_FOUND; 8EAPI extern Eina_Error EFL_MODEL_ERROR_NOT_FOUND;
9EFL_API extern Eina_Error EFL_MODEL_ERROR_READ_ONLY; 9EAPI extern Eina_Error EFL_MODEL_ERROR_READ_ONLY;
10EFL_API extern Eina_Error EFL_MODEL_ERROR_INIT_FAILED; 10EAPI extern Eina_Error EFL_MODEL_ERROR_INIT_FAILED;
11EFL_API extern Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE; 11EAPI extern Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE;
12EFL_API extern Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED; 12EAPI extern Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED;
13EFL_API extern Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT; /**< @since 1.19 */ 13EAPI extern Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT; /**< @since 1.19 */
14 14
15EFL_API extern Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY; /**< Returned when the given key during a efl_ui_property_bind does not exist on the object. */ 15EAPI extern Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY; /**< Returned when the given key during a efl_ui_property_bind does not exist on the object. */
16 16
17EFL_API extern Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED; /**< Returned error when factory got a request that it can't fullfil due to a set of unsupported parameters @since 1.22 */ 17EAPI extern Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED; /**< Returned error when factory got a request that it can't fullfil due to a set of unsupported parameters @since 1.22 */
18 18
19#include "interfaces/efl_model.eo.h" 19#include "interfaces/efl_model.eo.h"
20 20
21EFL_API int efl_model_init(void); 21EAPI int efl_model_init(void);
22 22
23 23
24/** 24/**
@@ -29,7 +29,7 @@ EFL_API int efl_model_init(void);
29 * 29 *
30 * @since 1.17 30 * @since 1.17
31 */ 31 */
32EFL_API void _efl_model_properties_changed_internal(const Efl_Model *model, ...); 32EAPI void _efl_model_properties_changed_internal(const Efl_Model *model, ...);
33 33
34#define efl_model_properties_changed(Model, ...) _efl_model_properties_changed_internal(Model, ##__VA_ARGS__, NULL) 34#define efl_model_properties_changed(Model, ...) _efl_model_properties_changed_internal(Model, ##__VA_ARGS__, NULL)
35 35
@@ -41,7 +41,7 @@ EFL_API void _efl_model_properties_changed_internal(const Efl_Model *model, ...)
41 * 41 *
42 * @since 1.17 42 * @since 1.17
43 */ 43 */
44EFL_API void efl_model_property_invalidated_notify(Efl_Model *model, const char *property); 44EAPI void efl_model_property_invalidated_notify(Efl_Model *model, const char *property);
45 45
46/** 46/**
47 * @brief Callback to setup a member of @c Eina_Value_Struct 47 * @brief Callback to setup a member of @c Eina_Value_Struct
@@ -62,7 +62,7 @@ typedef void (*Efl_Model_Value_Struct_Member_Setup_Cb)(void *data, int index, Ei
62 * 62 *
63 * @since 1.17 63 * @since 1.17
64 */ 64 */
65EFL_API Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data) EINA_ARG_NONNULL(2); 65EAPI Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data) EINA_ARG_NONNULL(2);
66 66
67/** 67/**
68 * @brief Frees the memory allocated to the struct description. 68 * @brief Frees the memory allocated to the struct description.
@@ -71,6 +71,6 @@ EFL_API Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned
71 * 71 *
72 * @since 1.17 72 * @since 1.17
73 */ 73 */
74EFL_API void efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc); 74EAPI void efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc);
75 75
76#endif 76#endif
diff --git a/src/lib/efl/efl_api.h b/src/lib/efl/efl_api.h
deleted file mode 100644
index 51e4905d11..0000000000
--- a/src/lib/efl/efl_api.h
+++ /dev/null
@@ -1,32 +0,0 @@
1#ifndef _EFL_EFL_API_H
2#define _EFL_EFL_API_H
3
4#ifdef EFL_API
5#error EFL_API should not be already defined
6#endif
7
8#ifdef _WIN32
9# ifndef EFL_STATIC
10# ifdef EFL_BUILD
11# define EFL_API __declspec(dllexport)
12# else
13# define EFL_API __declspec(dllimport)
14# endif
15# else
16# define EFL_API
17# endif
18# define EFL_API_WEAK
19#elif defined(__GNUC__)
20# if __GNUC__ >= 4
21# define EFL_API __attribute__ ((visibility("default")))
22# define EFL_API_WEAK __attribute__ ((weak))
23# else
24# define EFL_API
25# define EFL_API_WEAK
26# endif
27#else
28# define EFL_API
29# define EFL_API_WEAK
30#endif
31
32#endif
diff --git a/src/lib/efl/interfaces/efl_file.c b/src/lib/efl/interfaces/efl_file.c
index d97178c99c..206a4eb789 100644
--- a/src/lib/efl/interfaces/efl_file.c
+++ b/src/lib/efl/interfaces/efl_file.c
@@ -167,7 +167,7 @@ _efl_file_efl_object_finalize(Eo *obj, Efl_File_Data *pd)
167 167
168//////////////////////////////////////////////////////////////////////////// 168////////////////////////////////////////////////////////////////////////////
169 169
170EFL_API Eina_Bool 170EAPI Eina_Bool
171efl_file_simple_load(Eo *obj, const char *file, const char *key) 171efl_file_simple_load(Eo *obj, const char *file, const char *key)
172{ 172{
173 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 173 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
@@ -192,7 +192,7 @@ fail:
192 return EINA_FALSE; 192 return EINA_FALSE;
193} 193}
194 194
195EFL_API Eina_Bool 195EAPI Eina_Bool
196efl_file_simple_mmap_load(Eo *obj, const Eina_File *file, const char *key) 196efl_file_simple_mmap_load(Eo *obj, const Eina_File *file, const char *key)
197{ 197{
198 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 198 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
@@ -213,7 +213,7 @@ fail:
213 return EINA_FALSE; 213 return EINA_FALSE;
214} 214}
215 215
216EFL_API void 216EAPI void
217efl_file_simple_get(const Eo *obj, const char **file, const char **key) 217efl_file_simple_get(const Eo *obj, const char **file, const char **key)
218{ 218{
219 efl_ref((Eo*)obj); 219 efl_ref((Eo*)obj);
@@ -222,7 +222,7 @@ efl_file_simple_get(const Eo *obj, const char **file, const char **key)
222 efl_unref((Eo*)obj); 222 efl_unref((Eo*)obj);
223} 223}
224 224
225EFL_API void 225EAPI void
226efl_file_simple_mmap_get(const Eo *obj, const Eina_File **file, const char **key) 226efl_file_simple_mmap_get(const Eo *obj, const Eina_File **file, const char **key)
227{ 227{
228 efl_ref((Eo*)obj); 228 efl_ref((Eo*)obj);
diff --git a/src/lib/efl/interfaces/efl_file.h b/src/lib/efl/interfaces/efl_file.h
index be56f5b371..d0457148e4 100644
--- a/src/lib/efl/interfaces/efl_file.h
+++ b/src/lib/efl/interfaces/efl_file.h
@@ -2,9 +2,9 @@
2# define _EFL_FILE_H 2# define _EFL_FILE_H
3 3
4/* add doc note about needing ref/unref when passing efl_part to these functions */ 4/* add doc note about needing ref/unref when passing efl_part to these functions */
5EFL_API Eina_Bool efl_file_simple_load(Eo *obj, const char *file, const char *key); 5EAPI Eina_Bool efl_file_simple_load(Eo *obj, const char *file, const char *key);
6EFL_API Eina_Bool efl_file_simple_mmap_load(Eo *obj, const Eina_File *file, const char *key); 6EAPI Eina_Bool efl_file_simple_mmap_load(Eo *obj, const Eina_File *file, const char *key);
7EFL_API void efl_file_simple_get(const Eo *obj, const char **file, const char **key); 7EAPI void efl_file_simple_get(const Eo *obj, const char **file, const char **key);
8EFL_API void efl_file_simple_mmap_get(const Eo *obj, const Eina_File **file, const char **key); 8EAPI void efl_file_simple_mmap_get(const Eo *obj, const Eina_File **file, const char **key);
9 9
10#endif 10#endif
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 5cf5569f6f..4856df5a6e 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -85,7 +85,7 @@ _noref_death(void *data EINA_UNUSED, const Efl_Event *event)
85 efl_del(event->object); 85 efl_del(event->object);
86} 86}
87 87
88EFL_API Efl_Object * 88EAPI Efl_Object *
89efl_part(const Eo *obj, const char *name) 89efl_part(const Eo *obj, const char *name)
90{ 90{
91 Efl_Object *r; 91 Efl_Object *r;
@@ -105,7 +105,7 @@ efl_part(const Eo *obj, const char *name)
105 return efl_ref(r); 105 return efl_ref(r);
106} 106}
107 107
108EFL_API void 108EAPI void
109__efl_internal_init(void) 109__efl_internal_init(void)
110{ 110{
111 efl_model_init(); 111 efl_model_init();
diff --git a/src/lib/efl/interfaces/efl_mvvm_common.c b/src/lib/efl/interfaces/efl_mvvm_common.c
index 163abf0141..a2c7fa4f8d 100644
--- a/src/lib/efl/interfaces/efl_mvvm_common.c
+++ b/src/lib/efl/interfaces/efl_mvvm_common.c
@@ -5,17 +5,17 @@
5#include "Efl.h" 5#include "Efl.h"
6#include "Efl_MVVM_Common.h" 6#include "Efl_MVVM_Common.h"
7 7
8EFL_API Eina_Error EFL_MODEL_ERROR_UNKNOWN = 0; 8EAPI Eina_Error EFL_MODEL_ERROR_UNKNOWN = 0;
9EFL_API Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED = 0; 9EAPI Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED = 0;
10EFL_API Eina_Error EFL_MODEL_ERROR_NOT_FOUND = 0; 10EAPI Eina_Error EFL_MODEL_ERROR_NOT_FOUND = 0;
11EFL_API Eina_Error EFL_MODEL_ERROR_READ_ONLY = 0; 11EAPI Eina_Error EFL_MODEL_ERROR_READ_ONLY = 0;
12EFL_API Eina_Error EFL_MODEL_ERROR_INIT_FAILED = 0; 12EAPI Eina_Error EFL_MODEL_ERROR_INIT_FAILED = 0;
13EFL_API Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED = 0; 13EAPI Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED = 0;
14EFL_API Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE = 0; 14EAPI Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE = 0;
15EFL_API Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT = 0; 15EAPI Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT = 0;
16 16
17EFL_API Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED = 0; 17EAPI Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED = 0;
18EFL_API Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY = 0; 18EAPI Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY = 0;
19 19
20static const char EFL_MODEL_ERROR_UNKNOWN_STR[] = "Unknown Error"; 20static const char EFL_MODEL_ERROR_UNKNOWN_STR[] = "Unknown Error";
21static const char EFL_MODEL_ERROR_NOT_SUPPORTED_STR[] = "Operation not supported"; 21static const char EFL_MODEL_ERROR_NOT_SUPPORTED_STR[] = "Operation not supported";
@@ -31,7 +31,7 @@ static const char EFL_FACTORY_ERROR_NOT_SUPPORTED_STR[] = "Operation not suppo
31static const char EFL_PROPERTY_ERROR_INVALID_KEY_STR[] = "Incorrect key provided"; 31static const char EFL_PROPERTY_ERROR_INVALID_KEY_STR[] = "Incorrect key provided";
32 32
33 33
34EFL_API int 34EAPI int
35efl_model_init(void) 35efl_model_init(void)
36{ 36{
37#define _ERROR(Name) EFL_MODEL_ERROR_##Name = eina_error_msg_static_register(EFL_MODEL_ERROR_##Name##_STR); 37#define _ERROR(Name) EFL_MODEL_ERROR_##Name = eina_error_msg_static_register(EFL_MODEL_ERROR_##Name##_STR);
@@ -57,7 +57,7 @@ efl_model_init(void)
57 57
58#undef _ERROR 58#undef _ERROR
59 59
60EFL_API void 60EAPI void
61_efl_model_properties_changed_internal(const Efl_Model *model, ...) 61_efl_model_properties_changed_internal(const Efl_Model *model, ...)
62{ 62{
63 Efl_Model_Property_Event ev = { 0 }; 63 Efl_Model_Property_Event ev = { 0 };
@@ -84,7 +84,7 @@ _efl_model_properties_changed_internal(const Efl_Model *model, ...)
84 eina_array_free(properties); 84 eina_array_free(properties);
85} 85}
86 86
87EFL_API void 87EAPI void
88efl_model_property_invalidated_notify(Efl_Model *model, const char *property) 88efl_model_property_invalidated_notify(Efl_Model *model, const char *property)
89{ 89{
90 Eina_Array *invalidated_properties = eina_array_new(1); 90 Eina_Array *invalidated_properties = eina_array_new(1);
@@ -112,7 +112,7 @@ struct _Efl_Model_Value_Struct_Desc
112 Eina_Value_Struct_Member members[]; 112 Eina_Value_Struct_Member members[];
113}; 113};
114 114
115EFL_API Eina_Value_Struct_Desc * 115EAPI Eina_Value_Struct_Desc *
116efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data) 116efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data)
117{ 117{
118 Efl_Model_Value_Struct_Desc *desc; 118 Efl_Model_Value_Struct_Desc *desc;
@@ -152,7 +152,7 @@ efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Valu
152 return &desc->base; 152 return &desc->base;
153} 153}
154 154
155EFL_API void 155EAPI void
156efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc) 156efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc)
157{ 157{
158 size_t i; 158 size_t i;
diff --git a/src/lib/efl/interfaces/efl_observer.c b/src/lib/efl/interfaces/efl_observer.c
index 40d747e4fd..8656b801b9 100644
--- a/src/lib/efl/interfaces/efl_observer.c
+++ b/src/lib/efl/interfaces/efl_observer.c
@@ -257,7 +257,7 @@ _efl_observable_iterator_tuple_new(Eo *obj, Efl_Observable_Data *pd)
257 return &it->iterator; 257 return &it->iterator;
258} 258}
259 259
260EFL_API void 260EAPI void
261efl_observable_tuple_free(Efl_Observable_Tuple *tuple) 261efl_observable_tuple_free(Efl_Observable_Tuple *tuple)
262{ 262{
263 //key is not owned 263 //key is not owned
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index c31c27661f..0b1bdd4556 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -25,7 +25,6 @@ foreach eo_file : pub_legacy_eo_files
25 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 25 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
26 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 26 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
27 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 27 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
28 '-e', 'EFL_API',
29 '-gchd', '@INPUT@']) 28 '-gchd', '@INPUT@'])
30endforeach 29endforeach
31 30
@@ -108,7 +107,6 @@ foreach eo_file : pub_eo_files
108 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 107 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
109 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'), 108 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
110 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 109 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
111 '-e', 'EFL_API',
112 '-gchd', '@INPUT@']) 110 '-gchd', '@INPUT@'])
113endforeach 111endforeach
114 112
@@ -131,7 +129,6 @@ foreach eo_file : pub_eo_types_files
131 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories, 129 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
132 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), 130 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
133 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'), 131 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
134 '-e', 'EFL_API',
135 '-ghd', '@INPUT@']) 132 '-ghd', '@INPUT@'])
136endforeach 133endforeach
137 134
diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build
index 5ad170828d..5dbc825894 100644
--- a/src/lib/efl/meson.build
+++ b/src/lib/efl/meson.build
@@ -4,8 +4,7 @@ efl_ext_deps = []
4 4
5efl_header_src = [ 5efl_header_src = [
6 'Efl.h', 6 'Efl.h',
7 'Efl_MVVM_Common.h', 7 'Efl_MVVM_Common.h'
8 'efl_api.h'
9] 8]
10 9
11efl_src = [] 10efl_src = []
@@ -15,7 +14,7 @@ package_header_subdirs += 'interfaces'
15 14
16efl_lib = library('efl', 15efl_lib = library('efl',
17 efl_src, pub_eo_file_target, 16 efl_src, pub_eo_file_target,
18 c_args : [package_c_args, '-DEFL_BUILD'], 17 c_args : package_c_args,
19 dependencies: [efl_deps, efl_pub_deps, efl_ext_deps], 18 dependencies: [efl_deps, efl_pub_deps, efl_ext_deps],
20 install: true, 19 install: true,
21 version : meson.project_version() 20 version : meson.project_version()