shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 09:54:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on VC7

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-05-14 12:46:17 +02:00
parent e94bff02ba
commit abc61fa1cc
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ConfigureChecks.cmake
View File

@@ -44,7 +44,11 @@ if (WIN32)
check_function_exists(_vsnprintf_s HAVE__VSNPRINTF_S) check_function_exists(_vsnprintf_s HAVE__VSNPRINTF_S)
check_function_exists(_vsnprintf HAVE__VSNPRINTF) check_function_exists(_vsnprintf HAVE__VSNPRINTF)
endif(NOT HAVE_VSNPRINTF) endif(NOT HAVE_VSNPRINTF)
check_function_exists(snprintf HAVE_SNPRINTF)
if(NOT HAVE_SNPRINTF)
check_function_exists(_snprintf HAVE__SNPRINTF)
check_function_exists(_snprintf_s HAVE__SNPRINTF_S)
endif(NOT HAVE_HAVE_SNPRINTF)
check_function_exists(strncpy HAVE_STRNCPY) check_function_exists(strncpy HAVE_STRNCPY)
set(HAVE_SELECT TRUE) set(HAVE_SELECT TRUE)

10
config.h.cmake
View File

@@ -46,6 +46,16 @@
/* Define to 1 if you have the `_vsnprintf_s' function. */ /* Define to 1 if you have the `_vsnprintf_s' function. */
#cmakedefine HAVE__VSNPRINTF_S #cmakedefine HAVE__VSNPRINTF_S
/* Define to 1 if you have the `snprintf' function. */
#cmakedefine HAVE_SNPRINTF
/* Define to 1 if you have the `_snprintf' function. */
#cmakedefine HAVE__SNPRINTF
/* Define to 1 if you have the `_snprintf_s' function. */
#cmakedefine HAVE__SNPRINTF_S
/* Define to 1 if you have the `strncpy' function. */ /* Define to 1 if you have the `strncpy' function. */
#cmakedefine HAVE_STRNCPY #cmakedefine HAVE_STRNCPY

13
include/libssh/priv.h
View File

@@ -50,8 +50,17 @@
#undef strtok_r #undef strtok_r
#define strtok_r strtok_s #define strtok_r strtok_s
#undef snprintf #ifndef HAVE_SNPRINTF
#ifdef HAVE__SNPRINTF_S
#define snprintf(d, n, ...) _snprintf_s((d), (n), _TRUNCATE, __VA_ARGS__) #define snprintf(d, n, ...) _snprintf_s((d), (n), _TRUNCATE, __VA_ARGS__)
#else
#ifdef HAVE__SNPRINTF
#define snprintf _snprintf
#else
#error "no snprintf compatible function found"
#endif /* HAVE__SNPRINTF */
#endif /* HAVE__SNPRINTF_S */
#endif /* HAVE_SNPRINTF */
#ifndef HAVE_VSNPRINTF #ifndef HAVE_VSNPRINTF
#ifdef HAVE__VSNPRINTF_S #ifdef HAVE__VSNPRINTF_S
@@ -59,7 +68,7 @@
#elif HAVE__VSNPRINTF #elif HAVE__VSNPRINTF
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
#else /* HAVE_VSNPRINTF */ #else /* HAVE_VSNPRINTF */
#error "No vsnprintf compatibel function found" #error "No vsnprintf compatible function found"
#endif #endif
#endif /* HAVE_VSNPRINTF */ #endif /* HAVE_VSNPRINTF */