diff options
author | Andreas Schneider <asn@cynapses.org> | 2010-09-02 11:50:21 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cynapses.org> | 2010-09-02 11:50:59 +0200 |
commit | 0980117c52fd9e419d10c7193fd65e5ebe85ec4d (patch) | |
tree | 82e0d3961f4715c0554abfa673ac002fcaec915c | |
parent | 3d66164545bfb37a04f29a6221494322abf879a3 (diff) | |
download | libssh-0980117c52fd9e419d10c7193fd65e5ebe85ec4d.tar.gz libssh-0980117c52fd9e419d10c7193fd65e5ebe85ec4d.tar.xz libssh-0980117c52fd9e419d10c7193fd65e5ebe85ec4d.zip |
build: Fixed checking for printf function on Windows.
-rw-r--r-- | ConfigureChecks.cmake | 22 | ||||
-rw-r--r-- | config.h.cmake | 9 |
2 files changed, 20 insertions, 11 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1b9d6f6d..498e3d99 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -39,17 +39,6 @@ if (WIN32) set(HAVE_GETHOSTBYNAME TRUE) endif (HAVE_WSPIAPI_H OR HAVE_WS2TCPIP_H) - check_function_exists(vsnprintf HAVE_VSNPRINTF) - check_function_exists(snprintf HAVE_SNPRINTF) - - if (WIN32) - check_function_exists(_vsnprintf_s HAVE__VSNPRINTF_S) - check_function_exists(_vsnprintf HAVE__VSNPRINTF) - check_function_exists(_snprintf HAVE__SNPRINTF) - check_function_exists(_snprintf_s HAVE__SNPRINTF_S) - endif (WIN32) - check_function_exists(strncpy HAVE_STRNCPY) - set(HAVE_SELECT TRUE) endif (WIN32) @@ -64,6 +53,17 @@ check_include_file(openssl/des.h HAVE_OPENSSL_DES_H) # FUNCTIONS +check_function_exists(strncpy HAVE_STRNCPY) +check_function_exists(vsnprintf HAVE_VSNPRINTF) +check_function_exists(snprintf HAVE_SNPRINTF) + +if (WIN32) + check_function_exists(_vsnprintf_s HAVE__VSNPRINTF_S) + check_function_exists(_vsnprintf HAVE__VSNPRINTF) + check_function_exists(_snprintf HAVE__SNPRINTF) + check_function_exists(_snprintf_s HAVE__SNPRINTF_S) +endif (WIN32) + if (UNIX) # libsocket (Solaris) check_library_exists(socket getaddrinfo "" HAVE_LIBSOCKET) diff --git a/config.h.cmake b/config.h.cmake index bd74d89a..aa82deee 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -37,6 +37,15 @@ /*************************** FUNCTIONS ***************************/ +/* Define to 1 if you have the `snprintf' function. */ +#cmakedefine HAVE_SNPRINTF 1 + +/* Define to 1 if you have the `_snprintf' function. */ +#cmakedefine HAVE__SNPRINTF 1 + +/* Define to 1 if you have the `_snprintf_s' function. */ +#cmakedefine HAVE__SNPRINTF_S 1 + /* Define to 1 if you have the `vsnprintf' function. */ #cmakedefine HAVE_VSNPRINTF 1 |