diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 15:48:19 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-24 15:48:19 +0000 |
| commit | c6f372e7017b47987b5e887efe2529337948086c (patch) | |
| tree | 45379255df7d40ab4f7f6a03e405dca676c504ea /navit/fib-1.1 | |
| parent | 7e95b5685dc00b805d2d383535524e97c679dc7e (diff) | |
| download | navit-c6f372e7017b47987b5e887efe2529337948086c.tar.gz | |
Fix:Core:MSVC fixes|Thanks chollya
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3968 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/fib-1.1')
| -rw-r--r-- | navit/fib-1.1/fib.c | 4 | ||||
| -rw-r--r-- | navit/fib-1.1/fibpriv.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/navit/fib-1.1/fib.c b/navit/fib-1.1/fib.c index 276b6bd37..cf7451467 100644 --- a/navit/fib-1.1/fib.c +++ b/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/fib-1.1/fibpriv.h b/navit/fib-1.1/fibpriv.h index 3984b261e..a1f173557 100644 --- a/navit/fib-1.1/fibpriv.h +++ b/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_ */ |