Fix:Core:MSVC fixes|Thanks chollya

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

diff --git a/navit/navit/fib-1.1/fib.c b/navit/navit/fib-1.1/fib.c
index 276b6bd..cf74514 100644 (file)
--- a/navit/navit/fib-1.1/fib.c
+++ b/navit/navit/fib-1.1/fib.c
@@ -42,7 +42,7 @@
                } while (0)             \
 
 #define INT_BITS        (sizeof(int) * 8)
-static inline int
+static int
 ceillog2(unsigned int a)
 {
        int oa;
@@ -606,7 +606,7 @@ fhe_insertafter(struct fibheap_el *a, struct fibheap_el *b)
        }
 }
 
-static inline void
+static void
 fhe_insertbefore(struct fibheap_el *a, struct fibheap_el *b)
 {
        fhe_insertafter(a->fhe_left, b);

diff --git a/navit/navit/fib-1.1/fibpriv.h b/navit/navit/fib-1.1/fibpriv.h
index 3984b26..a1f1735 100644 (file)
--- a/navit/navit/fib-1.1/fibpriv.h
+++ b/navit/navit/fib-1.1/fibpriv.h
@@ -86,13 +86,13 @@ struct fibheap_el {
 static struct fibheap_el *fhe_newelem(void);
 static void fhe_initelem(struct fibheap_el *);
 static void fhe_insertafter(struct fibheap_el *a, struct fibheap_el *b);
-static inline void fhe_insertbefore(struct fibheap_el *a, struct fibheap_el *b);
+static void fhe_insertbefore(struct fibheap_el *a, struct fibheap_el *b);
 static struct fibheap_el *fhe_remove(struct fibheap_el *a);
 #define        fhe_destroy(x)  free((x))
 
 /*
  * general functions
  */
-static inline int ceillog2(unsigned int a);
+static int ceillog2(unsigned int a);
 
 #endif /* _FIBPRIV_H_ */