From b4becd5d7acb737ded54a3e2d440709b5fd3adc3 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Fri, 15 Mar 2013 09:44:26 +0100 Subject: [PATCH] efreet: fix compilation on Windows. --- src/lib/efreet/Efreet_Mime.h | 2 +- src/lib/efreet/Efreet_Trash.h | 2 +- src/lib/efreet/efreet_base.c | 4 ++-- src/lib/efreet/efreet_mime.c | 10 ++++++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lib/efreet/Efreet_Mime.h b/src/lib/efreet/Efreet_Mime.h index 5bfd418..cbde578 100644 --- a/src/lib/efreet/Efreet_Mime.h +++ b/src/lib/efreet/Efreet_Mime.h @@ -19,7 +19,7 @@ #endif #ifdef _WIN32 -# ifdef EFL_EFREET_MIME_BUILD +# ifdef EFL_EFREET_BUILD # ifdef DLL_EXPORT # define EAPI __declspec(dllexport) # else diff --git a/src/lib/efreet/Efreet_Trash.h b/src/lib/efreet/Efreet_Trash.h index a32be65..64af9ea 100644 --- a/src/lib/efreet/Efreet_Trash.h +++ b/src/lib/efreet/Efreet_Trash.h @@ -6,7 +6,7 @@ #endif #ifdef _WIN32 -# ifdef EFL_EFREET_TRASH_BUILD +# ifdef EFL_EFREET_BUILD # ifdef DLL_EXPORT # define EAPI __declspec(dllexport) # else diff --git a/src/lib/efreet/efreet_base.c b/src/lib/efreet/efreet_base.c index e2a4bfd..10f171e 100644 --- a/src/lib/efreet/efreet_base.c +++ b/src/lib/efreet/efreet_base.c @@ -9,6 +9,8 @@ # include #endif +#include + /* define macros and variable for using the eina logging system */ #define EFREET_MODULE_LOG_DOM _efreet_base_log_dom static int _efreet_base_log_dom = -1; @@ -16,8 +18,6 @@ static int _efreet_base_log_dom = -1; #include "Efreet.h" #include "efreet_private.h" -#include - static Efreet_Version _version = { VMAJ, VMIN, VMIC, VREV }; EAPI Efreet_Version *efreet_version = &_version; diff --git a/src/lib/efreet/efreet_mime.c b/src/lib/efreet/efreet_mime.c index 2c648db..d112fe4 100644 --- a/src/lib/efreet/efreet_mime.c +++ b/src/lib/efreet/efreet_mime.c @@ -8,8 +8,14 @@ #include #include #include -#include -#include + +#ifdef HAVE_NETINET_IN_H +# include +#endif + +#ifdef HAVE_ARPA_INET_H +# include +#endif #ifdef _WIN32 # include -- 2.7.4