Fix:Core:MSVC fixes

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4023 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/debug.c b/navit/navit/debug.c
index 0548a3c..d69d066 100644 (file)
--- a/navit/navit/debug.c
+++ b/navit/navit/debug.c
@@ -328,6 +328,9 @@ debug_malloc(const char *where, int line, const char *func, int size)
        if (head->next) 
                head->next->prev=head;
        head->where=g_strdup_printf("%s:%d %s",where,line,func);
+#if !defined (__GNUC__)
+#define __builtin_return_address(x) NULL
+#endif
        head->return_address[0]=__builtin_return_address(0);
        head->return_address[1]=__builtin_return_address(1);
        head->return_address[2]=__builtin_return_address(2);

diff --git a/navit/navit/file.c b/navit/navit/file.c
index c2391ab..1177973 100644 (file)
--- a/navit/navit/file.c
+++ b/navit/navit/file.c
@@ -261,6 +261,10 @@ file_create_url(char *url)
 }
 #endif
 
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif
+
 int file_is_dir(char *name)
 {
        struct stat buf;