diff options
author | Jean Guyomarc'h <jean.guyomarch@gmail.com> | 2015-05-10 22:58:11 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-05-10 22:58:14 +0200 |
commit | 3a3b12d40348eec715327abfe78b34c7fbaeb6cc (patch) | |
tree | 915225a1ca090be5819d99f7c6764f7f66eddbab /src/lib/ethumb/ethumb_private.h | |
parent | b85713a0a494a1db778a24dc01b0a6dcdc00e4bc (diff) |
ecore_cocoa,ethumb: fix compiling after EAPI policy changes
Summary:
I went through a lot of undefined symbols while compiling ecore_evas_cocoa
module and ethumb-related binaries. E.g.:
Undefined symbols for architecture x86_64:
"_ECORE_COCOA_EVENT_EXPOSE", referenced from:
_ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
"_ECORE_COCOA_EVENT_GOT_FOCUS", referenced from:
_ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
"_ECORE_COCOA_EVENT_LOST_FOCUS", referenced from:
_ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
"_ECORE_COCOA_EVENT_RESIZE", referenced from:
_ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
"_ECORE_COCOA_EVENT_WINDOW_DESTROY", referenced from:
_ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
"_ecore_cocoa_init", referenced from:
_ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
"_ecore_cocoa_screen_size_get", referenced from:
__ecore_evas_screen_geometry_get in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
"_ecore_cocoa_shutdown", referenced from:
_ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
__ecore_evas_cocoa_free in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o
Undefined symbols for architecture x86_64:
"_ethumb_calculate_aspect_from_ratio", referenced from:
__resize_movie in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_calculate_fill_from_ratio", referenced from:
__resize_movie in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_ecore_evas_get", referenced from:
__frame_decode_cb in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_evas_get", referenced from:
__thumb_generate in modules_ethumb_emotion_module_la-emotion.o
__finish_thumb_generation in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_finished_callback_call", referenced from:
__thumb_generate in modules_ethumb_emotion_module_la-emotion.o
__frame_decode_cb in modules_ethumb_emotion_module_la-emotion.o
__finish_thumb_generation in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_image_save", referenced from:
__frame_decode_cb in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_plugin_image_resize", referenced from:
__resize_movie in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_plugin_register", referenced from:
__module_init in modules_ethumb_emotion_module_la-emotion.o
"_ethumb_plugin_unregister", referenced from:
__module_shutdown in modules_ethumb_emotion_module_la-emotion.o
EAPI was not well re-defined in both cases. It has been handled in
ecore_cocoa_private.h and ethumb_private.h. These files must be included
after a main library header (because EAPI is undef there).
Reviewers: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2483
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/ethumb/ethumb_private.h')
-rw-r--r-- | src/lib/ethumb/ethumb_private.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/lib/ethumb/ethumb_private.h b/src/lib/ethumb/ethumb_private.h index 49e4de9f67..32e42ac716 100644 --- a/src/lib/ethumb/ethumb_private.h +++ b/src/lib/ethumb/ethumb_private.h | |||
@@ -4,6 +4,32 @@ | |||
4 | #include <Ethumb.h> | 4 | #include <Ethumb.h> |
5 | #include <Ethumb_Plugin.h> | 5 | #include <Ethumb_Plugin.h> |
6 | 6 | ||
7 | #ifdef EAPI | ||
8 | # undef EAPI | ||
9 | #endif | ||
10 | |||
11 | #ifdef _WIN32 | ||
12 | # ifdef EFL_ETHUMB_BUILD | ||
13 | # ifdef DLL_EXPORT | ||
14 | # define EAPI __declspec(dllexport) | ||
15 | # else | ||
16 | # define EAPI | ||
17 | # endif /* ! DLL_EXPORT */ | ||
18 | # else | ||
19 | # define EAPI __declspec(dllimport) | ||
20 | # endif /* ! EFL_ETHUMB_BUILD */ | ||
21 | #else | ||
22 | # ifdef __GNUC__ | ||
23 | # if __GNUC__ >= 4 | ||
24 | # define EAPI __attribute__ ((visibility("default"))) | ||
25 | # else | ||
26 | # define EAPI | ||
27 | # endif | ||
28 | # else | ||
29 | # define EAPI | ||
30 | # endif | ||
31 | #endif /* ! _WIN32 */ | ||
32 | |||
7 | typedef struct _Ethumb_Frame Ethumb_Frame; | 33 | typedef struct _Ethumb_Frame Ethumb_Frame; |
8 | 34 | ||
9 | struct _Ethumb_Frame | 35 | struct _Ethumb_Frame |