summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-03-02 14:40:21 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-03-02 14:40:21 -0500
commitb1b875ce6772e014821a22d5e114837841e6adb7 (patch)
tree2d905f0e9eaaa52a56f9adddaddc0307ff2c37f9
parent1792af52a3ea9d0279831c1e1c24d6d245696b29 (diff)
undef EAPI in public header
-rw-r--r--src/lib/Efx.h2
-rw-r--r--src/lib/efx_private.h26
2 files changed, 27 insertions, 1 deletions
diff --git a/src/lib/Efx.h b/src/lib/Efx.h
index 8730589..e2c7104 100644
--- a/src/lib/Efx.h
+++ b/src/lib/Efx.h
@@ -1071,4 +1071,6 @@ EAPI void efx_resize_stop(Evas_Object *obj);
1071} 1071}
1072#endif 1072#endif
1073 1073
1074#undef EAPI
1075
1074#endif 1076#endif
diff --git a/src/lib/efx_private.h b/src/lib/efx_private.h
index d26d9da..9ab13f5 100644
--- a/src/lib/efx_private.h
+++ b/src/lib/efx_private.h
@@ -18,7 +18,31 @@
18#define ERR(...) EINA_LOG_DOM_ERR(_efx_log_dom, __VA_ARGS__) 18#define ERR(...) EINA_LOG_DOM_ERR(_efx_log_dom, __VA_ARGS__)
19#define CRI(...) EINA_LOG_DOM_CRIT(_efx_log_dom, __VA_ARGS__) 19#define CRI(...) EINA_LOG_DOM_CRIT(_efx_log_dom, __VA_ARGS__)
20 20
21 21#ifdef EAPI
22# undef EAPI
23#endif /* ifdef EAPI */
24
25#ifdef _WIN32
26# ifdef EFL_EFX_BUILD
27# ifdef DLL_EXPORT
28# define EAPI __declspec(dllexport)
29# else /* ifdef DLL_EXPORT */
30# define EAPI
31# endif /* ! DLL_EXPORT */
32# else /* ifdef EFL_BUILD */
33# define EAPI __declspec(dllimport)
34# endif /* ! EFL_BUILD */
35#else /* ifdef _WIN32 */
36# ifdef __GNUC__
37# if __GNUC__ >= 4
38# define EAPI __attribute__ ((visibility("default")))
39# else /* if __GNUC__ >= 4 */
40# define EAPI
41# endif /* if __GNUC__ >= 4 */
42# else /* ifdef __GNUC__ */
43# define EAPI
44# endif /* ifdef __GNUC__ */
45#endif /* ! _WIN32 */
22#ifndef MIN 46#ifndef MIN
23#define MIN(a, b) (((a) < (b)) ? (a) : (b)) 47#define MIN(a, b) (((a) < (b)) ? (a) : (b))
24#endif 48#endif