summaryrefslogtreecommitdiff
path: root/src/lib/evil
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/evil
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/evil')
-rw-r--r--src/lib/evil/evil_macro.h2
-rw-r--r--src/lib/evil/fnmatch.h13
-rw-r--r--src/lib/evil/pwd.h4
3 files changed, 11 insertions, 8 deletions
diff --git a/src/lib/evil/evil_macro.h b/src/lib/evil/evil_macro.h
index 966710c..88cec3d 100644
--- a/src/lib/evil/evil_macro.h
+++ b/src/lib/evil/evil_macro.h
@@ -9,7 +9,7 @@
9# undef EAPI 9# undef EAPI
10#endif 10#endif
11 11
12#ifdef EFL_EVIL_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
diff --git a/src/lib/evil/fnmatch.h b/src/lib/evil/fnmatch.h
index f2a9266..0464fa7 100644
--- a/src/lib/evil/fnmatch.h
+++ b/src/lib/evil/fnmatch.h
@@ -3,19 +3,19 @@
3 3
4#ifdef EAPI 4#ifdef EAPI
5# undef EAPI 5# undef EAPI
6#endif /* EAPI */ 6#endif
7 7
8#ifdef _WIN32 8#ifdef _WIN32
9# ifdef EFL_EVIL_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_EVIL_BUILD */ 17# endif
18#endif /* _WIN32 */ 18#endif
19 19
20#ifdef __cplusplus 20#ifdef __cplusplus
21extern "C" { 21extern "C" {
@@ -51,4 +51,7 @@ EAPI int fnmatch(const char *__pattern, const char *__string, int __flags);
51} 51}
52#endif 52#endif
53 53
54#undef EAPI
55#define EAPI
56
54#endif /* __EVIL_FNMATCH_H__ */ 57#endif /* __EVIL_FNMATCH_H__ */
diff --git a/src/lib/evil/pwd.h b/src/lib/evil/pwd.h
index fd422eb..2d30338 100644
--- a/src/lib/evil/pwd.h
+++ b/src/lib/evil/pwd.h
@@ -20,10 +20,10 @@
20 20
21#ifdef EAPI 21#ifdef EAPI
22# undef EAPI 22# undef EAPI
23#endif /* EAPI */ 23#endif
24 24
25#ifdef _WIN32 25#ifdef _WIN32
26# ifdef EFL_EVIL_BUILD 26# ifdef EFL_BUILD
27# ifdef DLL_EXPORT 27# ifdef DLL_EXPORT
28# define EAPI __declspec(dllexport) 28# define EAPI __declspec(dllexport)
29# else 29# else