diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-15 09:10:11 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-15 09:10:11 +0000 |
| commit | 8041cf023d238e25b8955f74e64a71503a150bc8 (patch) | |
| tree | db69892cc6302336a09e91a02084eca40e166429 /navit/support | |
| parent | 645b269e21a305bbd9f63d727910d18233f37bbb (diff) | |
| download | navit-svn-8041cf023d238e25b8955f74e64a71503a150bc8.tar.gz | |
Fix:Core:More msvc fixes
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4167 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/support')
| -rw-r--r-- | navit/support/glib/fake.h | 2 | ||||
| -rw-r--r-- | navit/support/win32/stdint.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/navit/support/glib/fake.h b/navit/support/glib/fake.h index 44e79b91..9ec0b44b 100644 --- a/navit/support/glib/fake.h +++ b/navit/support/glib/fake.h @@ -26,7 +26,7 @@ # define g_mutex_new g_mutex_new_navit # define g_mutex_lock(lock) (EnterCriticalSection(lock)) # define g_mutex_unlock(lock) (LeaveCriticalSection(lock)) -# define g_mutex_trylock(lock) (TryEnterCriticalSection(lock)) +# define g_mutex_trylock(lock) 1//(TryEnterCriticalSection(lock)) # define GPrivate int # define g_private_new(xd) g_private_new_navit() # define g_private_get(xd) TlsGetValue(xd) diff --git a/navit/support/win32/stdint.h b/navit/support/win32/stdint.h index c382cfd9..785a6398 100644 --- a/navit/support/win32/stdint.h +++ b/navit/support/win32/stdint.h @@ -9,4 +9,5 @@ typedef int int32_t; typedef unsigned uint32_t; typedef long long int64_t; typedef unsigned long long uint64_t; +typedef unsigned long long uintmax_t; #endif /* _MSC_VER */ |