summaryrefslogtreecommitdiff
path: root/src/lib/ecore/efl_general.h
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-11-14 20:08:09 -0800
committerCedric Bail <cedric@osg.samsung.com>2017-11-14 20:08:09 -0800
commit663e31413a21030be8989eee82204f9351d2517c (patch)
tree8e255086a213704428078edfd57ce3727e0fb68b /src/lib/ecore/efl_general.h
parent2cea85db388d34337676466ef7f50c22e685c7d0 (diff)
Revert "Revert series of patches from cedric (due to dependencies and conflicts)"
This reverts commit 2cea85db388d34337676466ef7f50c22e685c7d0. Their was a typo that I made during cleanup of the patch before pushing that I didn't notice broke some stuff. But also you may have an old efl_general.h in your elementary directory that is now being picked instead of the one provided by the tree.
Diffstat (limited to 'src/lib/ecore/efl_general.h')
-rw-r--r--src/lib/ecore/efl_general.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h
index c91f61fce2..3a79e46d33 100644
--- a/src/lib/ecore/efl_general.h
+++ b/src/lib/ecore/efl_general.h
@@ -13,6 +13,23 @@
13#undef __EFL_NET 13#undef __EFL_NET
14#undef EFL_MAIN 14#undef EFL_MAIN
15#undef EFL_MAIN_EX 15#undef EFL_MAIN_EX
16#undef EAPI_MAIN
17
18#ifdef _WIN32
19// There is no support for quicklaunch on windows, so no needs
20// to export the efl_main symbol
21# define EAPI_MAIN
22#else
23# ifdef __GNUC__
24# if __GNUC__ >= 4
25# define EAPI_MAIN __attribute__ ((visibility("default")))
26# else
27# define EAPI_MAIN
28# endif
29# else
30# define EAPI_MAIN
31# endif
32#endif /* ! _WIN32 */
16 33
17#ifdef EFL_VERSION_MICRO 34#ifdef EFL_VERSION_MICRO
18# define _EFL_VERSION_MICRO EFL_VERSION_MICRO 35# define _EFL_VERSION_MICRO EFL_VERSION_MICRO