From: Enlightenment S. <no-...@en...> - 2010-11-26 17:05:23
|
Log: fix compilation on Windows Author: caro Date: 2010-11-26 09:05:16 -0800 (Fri, 26 Nov 2010) New Revision: 55021 Added: trunk/efreet/src/lib/efreet_icon_private.h Modified: trunk/efreet/src/lib/efreet_cache.c trunk/efreet/src/lib/efreet_desktop.c trunk/efreet/src/lib/efreet_desktop_command.c trunk/efreet/src/lib/efreet_icon.c trunk/efreet/src/lib/efreet_mime.c trunk/efreet/src/lib/efreet_private.h trunk/efreet/src/lib/efreet_trash.c trunk/efreet/src/lib/efreet_utils.c Modified: trunk/efreet/src/lib/efreet_cache.c =================================================================== --- trunk/efreet/src/lib/efreet_cache.c 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_cache.c 2010-11-26 17:05:16 UTC (rev 55021) @@ -6,10 +6,13 @@ #include <fcntl.h> #include <sys/stat.h> +#include <Eet.h> +#include <Ecore.h> #include <Ecore_File.h> #include "Efreet.h" #include "efreet_private.h" +#include "efreet_icon_private.h" typedef struct _Efreet_Old_Cache Efreet_Old_Cache; Modified: trunk/efreet/src/lib/efreet_desktop.c =================================================================== --- trunk/efreet/src/lib/efreet_desktop.c 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_desktop.c 2010-11-26 17:05:16 UTC (rev 55021) @@ -26,8 +26,8 @@ #include <sys/mman.h> #include <fcntl.h> -#ifdef _WIN32 -# include <winsock2.h> +#ifdef HAVE_EVIL +# include <Evil.h> #endif #include <Ecore_File.h> @@ -133,6 +133,12 @@ return 0; } + if (!evil_sockets_init()) + { + ERR("Could not initialize Winsock system"); + return 0; + } + efreet_desktop_cache = eina_hash_string_superfast_new(NULL); efreet_desktop_types = NULL; @@ -168,6 +174,7 @@ EINA_LIST_FREE(efreet_desktop_dirs, dir) eina_stringshare_del(dir); IF_FREE_HASH(change_monitors); + evil_sockets_shutdown(); eina_log_domain_unregister(_efreet_desktop_log_dom); } Modified: trunk/efreet/src/lib/efreet_desktop_command.c =================================================================== --- trunk/efreet/src/lib/efreet_desktop_command.c 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_desktop_command.c 2010-11-26 17:05:16 UTC (rev 55021) @@ -25,6 +25,10 @@ #include <limits.h> #include <ctype.h> +#ifdef _WIN32 +# include <winsock2.h> +#endif + #include <Ecore_File.h> #include "Efreet.h" Modified: trunk/efreet/src/lib/efreet_icon.c =================================================================== --- trunk/efreet/src/lib/efreet_icon.c 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_icon.c 2010-11-26 17:05:16 UTC (rev 55021) @@ -28,10 +28,12 @@ #include <dirent.h> #include <limits.h> +#include <Eet.h> #include <Ecore_File.h> #include "Efreet.h" #include "efreet_private.h" +#include "efreet_icon_private.h" #ifdef EFREET_MODULE_LOG_DOM #undef EFREET_MODULE_LOG_DOM Modified: trunk/efreet/src/lib/efreet_mime.c =================================================================== --- trunk/efreet/src/lib/efreet_mime.c 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_mime.c 2010-11-26 17:05:16 UTC (rev 55021) @@ -734,7 +734,12 @@ struct stat s; int path_len = 0; + /* no link on Windows < Vista */ +#ifdef _WIN32 + if (!stat(file, &s)) +#else if (!lstat(file, &s)) +#endif { if (S_ISREG(s.st_mode)) return NULL; @@ -775,7 +780,11 @@ /* Truncate to last slash */ while (parent[--path_len] != '/') parent[path_len] = '\0'; +#ifdef _WIN32 + if (!stat(file, &s2)) +#else if (!lstat(parent, &s2)) +#endif { if (s.st_dev != s2.st_dev) return _mime_inode_mountpoint; Modified: trunk/efreet/src/lib/efreet_private.h =================================================================== --- trunk/efreet/src/lib/efreet_private.h 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_private.h 2010-11-26 17:05:16 UTC (rev 55021) @@ -1,10 +1,7 @@ #ifndef EFREET_PRIVATE_H #define EFREET_PRIVATE_H -#include <Eet.h> -#include <Ecore.h> - /** * @file efreet_private.h * @brief Contains methods and defines that are private to the Efreet @@ -211,8 +208,6 @@ const char *efreet_desktop_environment_get(void); -EAPI Eet_Data_Descriptor *efreet_desktop_edd_init(void); - void efreet_util_desktop_cache_reload(void); EAPI const char *efreet_desktop_util_cache_file(void); EAPI const char *efreet_desktop_cache_file(void); Modified: trunk/efreet/src/lib/efreet_trash.c =================================================================== --- trunk/efreet/src/lib/efreet_trash.c 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_trash.c 2010-11-26 17:05:16 UTC (rev 55021) @@ -20,6 +20,10 @@ static unsigned int _efreet_trash_init_count = 0; static const char *efreet_trash_dir = NULL; +#ifdef _WIN32 +# define getuid() GetCurrentProcessId() +#endif + /* define macros and variable for using the eina logging system */ #ifdef EFREET_MODULE_LOG_DOM Modified: trunk/efreet/src/lib/efreet_utils.c =================================================================== --- trunk/efreet/src/lib/efreet_utils.c 2010-11-26 16:46:35 UTC (rev 55020) +++ trunk/efreet/src/lib/efreet_utils.c 2010-11-26 17:05:16 UTC (rev 55021) @@ -27,6 +27,7 @@ #include <fnmatch.h> #include <limits.h> +#include <Eet.h> #include <Ecore_File.h> #include "Efreet.h" |