summaryrefslogtreecommitdiff
path: root/src/lib/ethumb
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/ethumb
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/ethumb')
-rw-r--r--src/lib/ethumb/Ethumb.h8
-rw-r--r--src/lib/ethumb/Ethumb_Plugin.h8
-rw-r--r--src/lib/ethumb/ethumb_private.h11
3 files changed, 15 insertions, 12 deletions
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
34extern "C" { 34extern "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
35extern "C" { 35extern "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
33typedef struct _Ethumb_Frame Ethumb_Frame; 33typedef 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__ */