From f248a9f7303b2f8884bfc7ba6d1b335e4807940b Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 17 Aug 2012 08:09:06 +0000 Subject: [PATCH] Elm: fix compilation on Windows SVN revision: 75367 --- legacy/elementary/src/lib/elm_priv.h | 30 +++++++++++++++++++ .../src/lib/elm_widget_fileselector.h | 4 --- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/src/lib/elm_priv.h b/legacy/elementary/src/lib/elm_priv.h index 0bed660eb4..be50413c5a 100644 --- a/legacy/elementary/src/lib/elm_priv.h +++ b/legacy/elementary/src/lib/elm_priv.h @@ -16,6 +16,36 @@ #include #endif +#ifdef HAVE_EIO +# include +#endif + +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef ELEMENTARY_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EVAS_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif /* ! _WIN32 */ + #include "elm_widget.h" #ifdef HAVE_LANGINFO_H diff --git a/legacy/elementary/src/lib/elm_widget_fileselector.h b/legacy/elementary/src/lib/elm_widget_fileselector.h index fdd5772789..c1e20880b7 100644 --- a/legacy/elementary/src/lib/elm_widget_fileselector.h +++ b/legacy/elementary/src/lib/elm_widget_fileselector.h @@ -3,10 +3,6 @@ #include "elm_widget_layout.h" -#ifdef HAVE_EIO -# include -#endif - /** * @addtogroup Widget * @{