aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2010-05-10 15:32:17 +0200
committerAndreas Schneider <mail@cynapses.org>2010-05-10 15:53:57 +0200
commit403ded1e978f716769ade6d099b2419e4fceaff7 (patch)
tree70362fad9e8039ebceaf293c643cc82c4910dfc6
parent6fd8de337628526ad841130e02b42fa3e1675c4e (diff)
downloadlibssh-403ded1e978f716769ade6d099b2419e4fceaff7.tar.gz
libssh-403ded1e978f716769ade6d099b2419e4fceaff7.tar.xz
libssh-403ded1e978f716769ade6d099b2419e4fceaff7.zip
Use configure checks to define vsnprintf and strncpy.
-rw-r--r--include/libssh/priv.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index b618ce42..dd1031d0 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>