[EGIT] [core/efl] master 01/01: elput: Adjust EAPI for windows build

[Chris Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=22e3ea20ee4feecbc794d4bc45570a9e6982c3ff

commit 22e3ea20ee4feecbc794d4bc45570a9e6982c3ff
Author: Chris Michael <cpmich...@osg.samsung.com>
Date:   Fri Apr 15 08:13:47 2016 -0400

    elput: Adjust EAPI for windows build
    
    Small patch to fix definition of EAPI on Windows. Thanks to vtorri for
    reporting.
    
    Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
 src/lib/elput/Elput.h | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/lib/elput/Elput.h b/src/lib/elput/Elput.h
index a1ac721..d629dd4 100644
--- a/src/lib/elput/Elput.h
+++ b/src/lib/elput/Elput.h
@@ -5,23 +5,27 @@
 #  undef EAPI
 # endif
 
-# ifdef _MSC_VER
-#  ifdef BUILDING_DLL
-#   define EAPI __declspec(dllexport)
-#  else // ifdef BUILDING_DLL
+# ifdef _WIN32
+#  ifdef EFL_ELPUT_BUILD
+#   ifdef DLL_EXPORT
+#    define EAPI __declspec(dllexport)
+#   else
+#    define EAPI
+#   endif /* ! DLL_EXPORT */
+#  else
 #   define EAPI __declspec(dllimport)
-#  endif // ifdef BUILDING_DLL
-# else // ifdef _MSC_VER
+#  endif /* ! EFL_ELPUT_BUILD */
+# else
 #  ifdef __GNUC__
 #   if __GNUC__ >= 4
 #    define EAPI __attribute__ ((visibility("default")))
-#   else // if __GNUC__ >= 4
+#   else
 #    define EAPI
-#   endif // if __GNUC__ >= 4
-#  else // ifdef __GNUC__
+#   endif
+#  else
 #   define EAPI
-#  endif // ifdef __GNUC__
-# endif // ifdef _MSC_VER
+#  endif
+# endif /* ! _WIN32 */
 
 # ifdef EFL_BETA_API_SUPPORT
 

--