From 2b6fa19fe5bda7eb4728aabaa42a3da28a8e8b0e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cynapses.org>
Date: Sun, 2 Jan 2011 19:13:07 +0100
Subject: [PATCH] cmake: Fixed msvc posix warnings and unsecure functions.

---
 cmake/Modules/DefineCompilerFlags.cmake | 7 +++++--
 include/libssh/priv.h                   | 6 ------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake
index 176c3404..d43c454b 100644
--- a/cmake/Modules/DefineCompilerFlags.cmake
+++ b/cmake/Modules/DefineCompilerFlags.cmake
@@ -63,6 +63,9 @@ if (UNIX AND NOT WIN32)
 endif (UNIX AND NOT WIN32)
 
 if (MSVC)
-    # Suppress warning about "deprecated" functions
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
+    # Use secure functions by defaualt and suppress warnings about
+    #"deprecated" functions
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
 endif (MSVC)
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index d797f5e6..66f24e2d 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -46,9 +46,6 @@
 #  undef inline
 #  define inline __inline
 
-#  undef strdup
-#  define strdup _strdup
-
 #  define strcasecmp _stricmp
 #  define strncasecmp _strnicmp
 #  define strtoull _strtoui64
@@ -87,9 +84,6 @@
 #   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 */