From 8ba02b6f4c5d62ef8eac689c71ecb3c5f33852a1 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Mon, 10 May 2010 15:32:17 +0200
Subject: Use configure checks to define vsnprintf and strncpy.

---
 include/libssh/priv.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 318680a..d53b642 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -52,11 +52,19 @@
 #undef snprintf
 #define snprintf(d, n, ...) _snprintf_s((d), (n), _TRUNCATE, __VA_ARGS__)
 
-#if _MSC_VER < 1500
+#ifndef HAVE_VSNPRINTF
+#ifdef HAVE__VSNPRINTF_S
 #define vsnprintf(s, n, f, v) _vsnprintf_s((s), (n), _TRUNCATE, (f), (v))
+#elif HAVE__VSNPRINTF
+#define vsnprintf _vsnprintf
+#else /* HAVE_VSNPRINTF */
+#error "No vsnprintf compatibel function found"
+#endif
+#endif /* HAVE_VSNPRINTF */
 
+#ifndef HAVE_STRNCPY
 #define strncpy(d, s, n) strncpy_s((d), (n), (s), _TRUNCATE)
-#endif /* _MSC_VER < 1500 */
+#endif
 #else /* _MSC_VER */
 
 #include <unistd.h>
-- 
cgit