From 8ceea9ce08295a3e51307db1eab6340450082f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Taylor=20Ienczak=20Zanette?= Date: Fri, 6 Mar 2020 12:46:20 -0300 Subject: [PATCH] windows: Create an evil_eapi.h to define EAPI --- src/lib/evil/evil_eapi.h | 18 ++++++++++++++++++ src/lib/evil/evil_private.h | 13 +------------ src/lib/evil/evil_unistd.h | 1 + 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 src/lib/evil/evil_eapi.h diff --git a/src/lib/evil/evil_eapi.h b/src/lib/evil/evil_eapi.h new file mode 100644 index 0000000000..2ee7f8466c --- /dev/null +++ b/src/lib/evil/evil_eapi.h @@ -0,0 +1,18 @@ +#ifndef EVIL_EAPI +#define EVIL_EAPI + +#ifdef EAPI +# undef EAPI +#endif + +#ifdef EFL_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif +#else +# define EAPI __declspec(dllimport) +#endif + +#endif diff --git a/src/lib/evil/evil_private.h b/src/lib/evil/evil_private.h index 3769d644dc..c9ba04a6b7 100644 --- a/src/lib/evil/evil_private.h +++ b/src/lib/evil/evil_private.h @@ -30,19 +30,8 @@ extern "C" { #include /* for mkdir in evil_macro_wrapper */ -#ifdef EAPI -# undef EAPI -#endif +#include "evil_eapi.h" -#ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -#else -# define EAPI __declspec(dllimport) -#endif #ifndef PATH_MAX # define PATH_MAX MAX_PATH diff --git a/src/lib/evil/evil_unistd.h b/src/lib/evil/evil_unistd.h index a227e14fc2..d738a720b7 100644 --- a/src/lib/evil/evil_unistd.h +++ b/src/lib/evil/evil_unistd.h @@ -1,6 +1,7 @@ #ifndef __EVIL_UNISTD_H__ #define __EVIL_UNISTD_H__ +#include "evil_eapi.h" /** * @file evil_unistd.h