Search a better location for MSVC definition intended for any file

diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 354fcec..c6c7101 100644 (file)
--- 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 748b475..69e6900 100644 (file)
--- 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 99f82a3..d990aaa 100644 (file)
--- 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;