summaryrefslogtreecommitdiff
path: root/src/lib/efreet
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/efreet
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/efreet')
-rw-r--r--src/lib/efreet/Efreet.h6
-rw-r--r--src/lib/efreet/Efreet_Mime.h9
-rw-r--r--src/lib/efreet/Efreet_Trash.h9
-rw-r--r--src/lib/efreet/efreet_cache_private.h6
-rw-r--r--src/lib/efreet/efreet_private.h6
5 files changed, 21 insertions, 15 deletions
diff --git a/src/lib/efreet/Efreet.h b/src/lib/efreet/Efreet.h
index e83784da1d..921ae52476 100644
--- a/src/lib/efreet/Efreet.h
+++ b/src/lib/efreet/Efreet.h
@@ -79,15 +79,15 @@
79#endif 79#endif
80 80
81#ifdef _WIN32 81#ifdef _WIN32
82# ifdef EFL_EFREET_BUILD 82# ifdef EFL_BUILD
83# ifdef DLL_EXPORT 83# ifdef DLL_EXPORT
84# define EAPI __declspec(dllexport) 84# define EAPI __declspec(dllexport)
85# else 85# else
86# define EAPI 86# define EAPI
87# endif /* ! DLL_EXPORT */ 87# endif
88# else 88# else
89# define EAPI __declspec(dllimport) 89# define EAPI __declspec(dllimport)
90# endif /* ! EFL_EFREET_BUILD */ 90# endif
91#else 91#else
92# ifdef __GNUC__ 92# ifdef __GNUC__
93# if __GNUC__ >= 4 93# if __GNUC__ >= 4
diff --git a/src/lib/efreet/Efreet_Mime.h b/src/lib/efreet/Efreet_Mime.h
index 1e1bc2b22b..29d65e516c 100644
--- a/src/lib/efreet/Efreet_Mime.h
+++ b/src/lib/efreet/Efreet_Mime.h
@@ -19,15 +19,15 @@
19#endif 19#endif
20 20
21#ifdef _WIN32 21#ifdef _WIN32
22# ifdef EFL_EFREET_BUILD 22# ifdef EFL_BUILD
23# ifdef DLL_EXPORT 23# ifdef DLL_EXPORT
24# define EAPI __declspec(dllexport) 24# define EAPI __declspec(dllexport)
25# else 25# else
26# define EAPI 26# define EAPI
27# endif /* ! DLL_EXPORT */ 27# endif
28# else 28# else
29# define EAPI __declspec(dllimport) 29# define EAPI __declspec(dllimport)
30# endif /* ! EFL_EFREET_MIME_BUILD */ 30# endif
31#else 31#else
32# ifdef __GNUC__ 32# ifdef __GNUC__
33# if __GNUC__ >= 4 33# if __GNUC__ >= 4
@@ -127,4 +127,7 @@ EAPI void efreet_mime_type_cache_flush(void);
127} 127}
128#endif 128#endif
129 129
130#undef EAPI
131#define EAPI
132
130#endif 133#endif
diff --git a/src/lib/efreet/Efreet_Trash.h b/src/lib/efreet/Efreet_Trash.h
index 64af9ea74c..5ecf41d9be 100644
--- a/src/lib/efreet/Efreet_Trash.h
+++ b/src/lib/efreet/Efreet_Trash.h
@@ -6,15 +6,15 @@
6#endif 6#endif
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9# ifdef EFL_EFREET_BUILD 9# ifdef EFL_BUILD
10# ifdef DLL_EXPORT 10# ifdef DLL_EXPORT
11# define EAPI __declspec(dllexport) 11# define EAPI __declspec(dllexport)
12# else 12# else
13# define EAPI 13# define EAPI
14# endif /* ! DLL_EXPORT */ 14# endif
15# else 15# else
16# define EAPI __declspec(dllimport) 16# define EAPI __declspec(dllimport)
17# endif /* ! EFL_EFREET_TRASH_BUILD */ 17# endif
18#else 18#else
19# ifdef __GNUC__ 19# ifdef __GNUC__
20# if __GNUC__ >= 4 20# if __GNUC__ >= 4
@@ -101,4 +101,7 @@ EAPI int efreet_trash_empty_trash(void);
101} 101}
102#endif 102#endif
103 103
104#undef EAPI
105#define EAPI
106
104#endif 107#endif
diff --git a/src/lib/efreet/efreet_cache_private.h b/src/lib/efreet/efreet_cache_private.h
index 79dbfa0c24..97dbd45a1e 100644
--- a/src/lib/efreet/efreet_cache_private.h
+++ b/src/lib/efreet/efreet_cache_private.h
@@ -17,15 +17,15 @@
17#endif 17#endif
18 18
19#ifdef _WIN32 19#ifdef _WIN32
20# ifdef EFL_EFREET_BUILD 20# ifdef EFL_BUILD
21# ifdef DLL_EXPORT 21# ifdef DLL_EXPORT
22# define EAPI __declspec(dllexport) 22# define EAPI __declspec(dllexport)
23# else 23# else
24# define EAPI 24# define EAPI
25# endif /* ! DLL_EXPORT */ 25# endif
26# else 26# else
27# define EAPI __declspec(dllimport) 27# define EAPI __declspec(dllimport)
28# endif /* ! EFL_EFREET_BUILD */ 28# endif
29#else 29#else
30# ifdef __GNUC__ 30# ifdef __GNUC__
31# if __GNUC__ >= 4 31# if __GNUC__ >= 4
diff --git a/src/lib/efreet/efreet_private.h b/src/lib/efreet/efreet_private.h
index 47d6deae12..eb42c28f74 100644
--- a/src/lib/efreet/efreet_private.h
+++ b/src/lib/efreet/efreet_private.h
@@ -6,15 +6,15 @@
6#endif 6#endif
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9# ifdef EFL_EFREET_BUILD 9# ifdef EFL_BUILD
10# ifdef DLL_EXPORT 10# ifdef DLL_EXPORT
11# define EAPI __declspec(dllexport) 11# define EAPI __declspec(dllexport)
12# else 12# else
13# define EAPI 13# define EAPI
14# endif /* ! DLL_EXPORT */ 14# endif
15# else 15# else
16# define EAPI __declspec(dllimport) 16# define EAPI __declspec(dllimport)
17# endif /* ! EFL_EFREET_BUILD */ 17# endif
18#else 18#else
19# ifdef __GNUC__ 19# ifdef __GNUC__
20# if __GNUC__ >= 4 20# if __GNUC__ >= 4