diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-25 15:37:50 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-25 15:37:50 +0000 |
| commit | 24ed71f08877dc22f6f6eecd90cecd21d0cc7bdd (patch) | |
| tree | 00a94aec4175ae56c520f41a0dcbfe36f4d7adbf | |
| parent | c5829d92aab1796d17183294ddc57dd3790e79c3 (diff) | |
| download | navit-svn-24ed71f08877dc22f6f6eecd90cecd21d0cc7bdd.tar.gz | |
Fix:Build:MSVC fixes
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4024 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | navit/file.c | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 751631ab..a86d3ac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,7 +328,7 @@ if(WIN32 OR WINCE) if(MSVC) add_plugin(support/xgetopt "Windows detected" TRUE) - add_plugin(intl_cmake "not yet supported on msvc" FALSE) + set(ENABLE_NLS FALSE) else(MSVC) set(ENABLE_NLS TRUE) endif(MSVC) @@ -444,6 +444,7 @@ CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN) CHECK_FUNCTION_EXISTS (valloc HAVE_VALLOC) CHECK_FUNCTION_EXISTS (posix_memalign HAVE_POSIX_MEMALIGN) CHECK_FUNCTION_EXISTS (popen HAVE_POPEN) +CHECK_FUNCTION_EXISTS (_atoi64 HAVE__ATOI64) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/config.h.cmake b/config.h.cmake index dcc4e98c..f5e1991c 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -60,3 +60,4 @@ #cmakedefine HAVE_GETOPT_H 1 +#cmakedefine HAVE__ATOI64 1 diff --git a/navit/file.c b/navit/file.c index 1177973d..1b9f9b1b 100644 --- a/navit/file.c +++ b/navit/file.c @@ -390,7 +390,11 @@ file_process_headers(struct file *file, char *headers) } cl=g_hash_table_lookup(file->headers, "content-length"); if (cl) +#ifdef HAVE__ATOI64 + file->size=_atoi64(cl); +#else file->size=atoll(cl); +#endif } static void |