summaryrefslogtreecommitdiff
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2018-01-18 18:04:03 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2018-01-18 18:04:03 +0900
commitf5b01ac5ce3d86c3bcd89c4882a77b1c126ca789 (patch)
treecb39aad3598224652d3117f64328d596678ffdc6 /src/lib/emotion
parent8a1655a15cb3863165a7dddaa6021953ce9c18ab (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.
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/Emotion.h8
-rw-r--r--src/lib/emotion/emotion_modules.h11
2 files changed, 11 insertions, 8 deletions
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index 6bd3234..d7eef3c 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
124extern "C" { 124extern "C" {
diff --git a/src/lib/emotion/emotion_modules.h b/src/lib/emotion/emotion_modules.h
index d5dd1dd..8e41121 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);
163EAPI Eina_Bool _emotion_module_register(const Emotion_Engine *api); 163EAPI Eina_Bool _emotion_module_register(const Emotion_Engine *api);
164EAPI Eina_Bool _emotion_module_unregister(const Emotion_Engine *api); 164EAPI Eina_Bool _emotion_module_unregister(const Emotion_Engine *api);
165 165
166#undef EAPI
167#define EAPI
168
166#endif 169#endif