From ac54a26c5d39a4b30e62384eb10d2398ac6ab789 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 13 Jul 2010 17:27:52 +0200 Subject: build: Fixed the Windows build. We have to include stdio.h for the printf function before we can do anything. --- include/libssh/priv.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 1672fb48..9b6e85aa 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -32,9 +32,69 @@ #include "config.h" -#ifndef _WIN32 +#ifdef _WIN32 + +# ifdef _MSC_VER +# include + +/* On Microsoft compilers define inline to __inline on all others use inline */ +# undef inline +# define inline __inline + +# undef strdup +# define strdup _strdup + +/* Imitate define of inttypes.h */ +# define PRIdS "Id" + +# define strcasecmp _stricmp +# define strncasecmp _strnicmp +# define strtoull _strtoui64 +# define isblank(ch) ((ch) == ' ' || (ch) == '\t' || (ch) == '\n' || (ch) == '\r') + +# define usleep(X) Sleep(((X)+1000)/1000) + +# undef strtok_r +# define strtok_r strtok_s + +# if defined(HAVE__SNPRINTF_S) +# undef snprintf +# define snprintf(d, n, ...) _snprintf_s((d), (n), _TRUNCATE, __VA_ARGS__) +# else /* HAVE__SNPRINTF_S */ +# if defined(HAVE__SNPRINTF) +# undef snprintf +# define snprintf _snprintf +# else /* HAVE__SNPRINTF */ +# if !defined(HAVE_SNPRINTF) +# error "no snprintf compatible function found" +# endif /* HAVE_SNPRINTF */ +# endif /* HAVE__SNPRINTF */ +# endif /* HAVE__SNPRINTF_S */ + +# if defined(HAVE__VSNPRINTF_S) +# undef vsnprintf +# define vsnprintf(s, n, f, v) _vsnprintf_s((s), (n), _TRUNCATE, (f), (v)) +# else /* HAVE__VSNPRINTF_S */ +# if defined(HAVE__VSNPRINTF) +# undef vsnprintf +# define vsnprintf _vsnprintf +# else +# if !defined(HAVE_VSNPRINTF) +# error "No vsnprintf compatible function found" +# endif /* HAVE_VSNPRINTF */ +# endif /* HAVE__VSNPRINTF */ +# endif /* HAVE__VSNPRINTF_S */ + +# ifndef HAVE_STRNCPY +# define strncpy(d, s, n) strncpy_s((d), (n), (s), _TRUNCATE) +# endif +# endif /* _MSC_VER */ + +#else /* _WIN32 */ + #include #define PRIdS "zd" + #endif /* _WIN32 */ #include "libssh/libssh.h" -- cgit