build: Fixed the Windows preprocessor macros and defines.

ConfigureChecks.cmake

@@ -40,15 +40,14 @@ if (WIN32)
   endif (HAVE_WSPIAPI_H OR HAVE_WS2TCPIP_H)
 
   check_function_exists(vsnprintf HAVE_VSNPRINTF)
-  if(NOT HAVE_VSNPRINTF)
+  check_function_exists(snprintf HAVE_SNPRINTF)
+
+  if (WIN32)
       check_function_exists(_vsnprintf_s HAVE__VSNPRINTF_S)
       check_function_exists(_vsnprintf 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_SNPRINTF)
+  endif (WIN32)
   check_function_exists(strncpy HAVE_STRNCPY)
 
   set(HAVE_SELECT TRUE)

config.h.cmake

@@ -127,6 +127,51 @@
 
 #  undef strdup
 #  define strdup _strdup
-# endif // _MSC_VER
+
+/* 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 deffined(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 */
 #endif /* _WIN32 */
 

include/libssh/priv.h

@@ -32,57 +32,10 @@
 
 #include "config.h"
 
-#ifdef _MSC_VER
+#ifndef _WIN32
-
-/** 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')
-
-#if _MSC_VER >= 1400
-#define strdup _strdup
-#endif
-#define usleep(X) Sleep(((X)+1000)/1000)
-
-#undef strtok_r
-#define strtok_r strtok_s
-
-#ifndef HAVE_SNPRINTF
-#ifdef HAVE__SNPRINTF_S
-#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
-#ifdef HAVE__VSNPRINTF_S
-#define vsnprintf(s, n, f, v) _vsnprintf_s((s), (n), _TRUNCATE, (f), (v))
-#else
-#ifdef HAVE__VSNPRINTF
-#define vsnprintf _vsnprintf
-#else /* HAVE_VSNPRINTF */
-#error "No vsnprintf compatible function found"
-#endif /* HAVE__VSNPRINTF */
-#endif /* HAVE__VSNPRINTF_S */
-#endif /* HAVE_VSNPRINTF */
-
-#ifndef HAVE_STRNCPY
-#define strncpy(d, s, n) strncpy_s((d), (n), (s), _TRUNCATE)
-#endif
-#else /* _MSC_VER */
-
 #include <unistd.h>
 #define PRIdS "zd"
-
+#endif /* _WIN32 */
-#endif /* _MSC_VER */
 
 #include "libssh/libssh.h"
 #include "libssh/callbacks.h"