diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-09 17:01:37 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-09 17:08:24 +0900 |
| commit | 5d1e959f92e14f1aa45f3c225d8351041125039b (patch) | |
| tree | 442b2140449a6038a82eb27387b482411152b9fb /src/lib | |
| parent | dee61f40973071bab093f2f81109a7f2d5ff4097 (diff) | |
| download | efl-5d1e959f92e14f1aa45f3c225d8351041125039b.tar.gz | |
elm: Fix modules due to a missing EAPI
I recently added an undef EAPI which wasn't in fact the best idea ever.
The EAPI needs to remain defined as is for elementary modules and
edje_externals.
Ping @vtorri
See ad6e3ce3df422751cb1c4524f1ea0b16ce897410
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/elementary/elm_module.c | 1 | ||||
| -rw-r--r-- | src/lib/elementary/elm_module_helper.h | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/lib/elementary/elm_module.c b/src/lib/elementary/elm_module.c index 03f70dc032..92557b1d50 100644 --- a/src/lib/elementary/elm_module.c +++ b/src/lib/elementary/elm_module.c @@ -111,6 +111,7 @@ _elm_module_find_as(const char *as) if (!_elm_module_load(m)) { + ERR("Failed to load elementary module: '%s': %m", m->as); _elm_module_del(m); return NULL; } diff --git a/src/lib/elementary/elm_module_helper.h b/src/lib/elementary/elm_module_helper.h new file mode 100644 index 0000000000..f4e7d22a99 --- /dev/null +++ b/src/lib/elementary/elm_module_helper.h @@ -0,0 +1,34 @@ +/* A small helper header defining EAPI for elementary modules, it should be + * included last in the modules C files. + */ + +#ifndef ELM_MODULE_HELPER_H +#define ELM_MODULE_HELPER_H + +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef ELEMENTARY_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EVAS_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif /* ! _WIN32 */ + +#endif |