diff options
| -rwxr-xr-x | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | navit/gui/internal/gui_internal.c | 2 | ||||
| -rw-r--r-- | navit/intl_cmake/vasnprintf.c | 10 |
4 files changed, 18 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2733e2e0..1ad0be11 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,8 @@ set(PACKAGE_STRING "${PACKAGE} ${PACKAGE_VERSION}") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") include("${PROJECT_SOURCE_DIR}/cmake/navit_macros.cmake") +SET(CMAKE_BUILD_TYPE Debug) + IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) @@ -144,6 +146,12 @@ CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND) CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD) CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET) CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) +if (NOT HAVE_SNPRINTF) + CHECK_FUNCTION_EXISTS(_snprintf HAVE_DECL__SNPRINTF) + if (HAVE_DECL__SNPRINTF) + set(HAVE_SNPRINTF 1) + endif(HAVE_DECL__SNPRINTF) +endif(NOT HAVE_SNPRINTF) CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES) CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL) CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) @@ -683,5 +691,3 @@ add_subdirectory (man) if (GETTEXT_FOUND) add_subdirectory (po) endif(GETTEXT_FOUND) - - diff --git a/config.h.cmake b/config.h.cmake index 2749ef56..8ed3cf57 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -44,6 +44,7 @@ #cmakedefine HAVE_SOCKET 1 #cmakedefine HAVE_SNPRINTF 1 +#cmakedefine HAVE_DECL__SNPRINTF 1 #cmakedefine HAVE_WINSOCK 1 diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c index 5ff4fbeb..9fd0986b 100644 --- a/navit/gui/internal/gui_internal.c +++ b/navit/gui/internal/gui_internal.c @@ -39,8 +39,6 @@ #endif #ifndef _MSC_VER #include <sys/time.h> -#else -#define snprintf sprintf_s #endif /* _MSC_VER */ #include "item.h" #include "file.h" diff --git a/navit/intl_cmake/vasnprintf.c b/navit/intl_cmake/vasnprintf.c index 8a62282d..e6e29cd6 100644 --- a/navit/intl_cmake/vasnprintf.c +++ b/navit/intl_cmake/vasnprintf.c @@ -111,7 +111,15 @@ VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list ar { DIRECTIVES d; arguments a; - +#ifdef _MSC_VER + static int notFirstTime=0; + if(!notFirstTime) + { + _set_printf_count_output( 1 ); + notFirstTime = 1; + } +#endif + if (PRINTF_PARSE (format, &d, &a) < 0) { errno = EINVAL; |