make evas_module.c and evas_path.c compile with vc++

SVN revision: 42641
This commit is contained in:
Vincent Torri 2009-09-23 07:12:11 +00:00
parent cefbd7abf5
commit c392f30e71
2 changed files with 20 additions and 3 deletions

View File

@ -6,6 +6,17 @@
#include <evas_common.h>
#include <evas_private.h>
#include <evas_module.h>
#ifdef _MSC_VER
# ifdef open
# undef open
# endif
# ifdef close
# undef close
# endif
#endif
static Eina_Hash *evas_modules[4] = {
NULL,
@ -41,7 +52,9 @@ void
evas_module_paths_init(void)
{
char *path, *path2;
#ifndef _MSC_VER
const char *path3;
#endif
/* 1. ~/.evas/modules/ */
path = eina_module_environment_path_get("HOME", "/.evas/modules");
@ -59,6 +72,7 @@ evas_module_paths_init(void)
evas_module_paths = _evas_module_append(evas_module_paths, path2);
/* 4. PREFIX/evas/modules/ */
#ifndef _MSC_VER
path3 = PACKAGE_LIB_DIR "/evas/modules";
if ((path && (strcmp(path, path3) != 0)) ||
(path2 && (strcmp(path2, path3) != 0)) ||
@ -68,6 +82,7 @@ evas_module_paths_init(void)
if (path)
evas_module_paths = _evas_module_append(evas_module_paths, path);
}
#endif
}
#define EVAS_EINA_STATIC_MODULE_DEFINE(Tn, Name) \

View File

@ -8,14 +8,16 @@
#endif
#include <limits.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
/* get the casefold feature! */
#include <fnmatch.h>
#include <dirent.h>
#ifndef _MSC_VER
# include <unistd.h>
# include <sys/param.h>
#endif
#ifdef HAVE_EVIL
# include <Evil.h>
@ -50,7 +52,7 @@ char *
evas_file_path_join(const char *path, const char *end)
{
char *res = NULL;
int len;
size_t len;
if ((!path) && (!end)) return NULL;
if (!path) return strdup(end);