From 28ee3c13eb0a0b49fc5fa202144d9dcefc316e8f Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 13 Sep 2015 14:15:33 +0200
Subject: [PATCH 1/1] Search a better location for MSVC definition intended for
 any file

---
 include/simgrid_config.h.in |  8 --------
 include/xbt/base.h          | 17 +++++++++++++++++
 include/xbt/sysdep.h        | 10 ----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 354fceccc7..c6c71013fa 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -58,14 +58,6 @@
 	#endif
 #endif
 
-#ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */
-	#if defined(_WIN64)
-		typedef __int64 ssize_t; 
-	#else
-		typedef long ssize_t;
-	#endif
-#endif
-
 /* Define to 1 if mmalloc is compiled in. */
 #cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@
 
diff --git a/include/xbt/base.h b/include/xbt/base.h
index 748b475626..69e69006e8 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -229,6 +229,23 @@
 
 #endif
 
+#ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */
+	#if defined(_WIN64)
+		typedef __int64 ssize_t;
+	#else
+		typedef long ssize_t;
+	#endif
+
+/* Microsoft wants to improve the code quality blah blah blah */
+/* See: https://msdn.microsoft.com/en-us/library/8ef0s5kh.aspx */
+	/* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
+	# define _CRT_NONSTDC_NO_WARNINGS
+	/* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
+	# define _CRT_SECURE_NO_WARNINGS
+#endif
+
+
+
 #ifdef _XBT_WIN32
 #define XBT_INTERNAL
 #else
diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 99f82a345d..d990aaa0e9 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -71,16 +71,6 @@ XBT_PUBLIC(char *) bprintf(const char *fmt, ...) _XBT_GNUC_PRINTF(1, 2);
  *  @{
  */
 
-#ifdef _MSC_VER /* Microsoft wants to improve the code quality blah blah blah */
-/* See: https://msdn.microsoft.com/en-us/library/8ef0s5kh.aspx */
-
-/* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
-# define _CRT_NONSTDC_NO_WARNINGS
-# define strdup _strdup
-/* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
-# define _CRT_SECURE_NO_WARNINGS
-#endif
-
 /** @brief Like strdup, but xbt_die() on error */
 static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
   char *res = NULL;
-- 
2.20.1