X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5b033d47fb71e1aa50b25a65f86abe4a003ccc5..657ace25fc9c54a83d3f99f0ee24322e3718089b:/src/win32/compiler/visualc.h

diff --git a/src/win32/compiler/visualc.h b/src/win32/compiler/visualc.h
index 699003dd76..0ed25e8114 100644
--- a/src/win32/compiler/visualc.h
+++ b/src/win32/compiler/visualc.h
@@ -14,6 +14,15 @@
 
 #include <win32/platform/select_platform_features.h>
 
+#ifdef _WIN32_WINNT
+	#if _WIN32_WINNT < 0x0400
+		#undef _WIN32_WINNT
+		#define _WIN32_WINNT 0x0400
+	#endif
+#else
+	#define _WIN32_WINNT 0x0400	
+#endif
+
 /* 
  * include files. 
  */
@@ -164,11 +173,31 @@
 	#undef HAVE_SIGNAL
 #endif
 
+/* "disable the snprintf replacement ( this function is broken on system v only" */
+
+
+
+#ifdef PREFER_PORTABLE_SNPRINTF
+# undef PREFER_PORTABLE_SNPRINTF	1	
+#endif
+
+
 /* The compiler has `snprintf' function. */
-#if defined(HAVE_SNPRINTF)
-	#undef HAVE_SNPRINTF	1
+#if _MSC_VER >= 1400 
+#  ifndef HAVE_SNPRINTF
+#    define HAVE_SNPRINTF	1
+#    ifndef PREFER_PORTABLE_SNPRINTF
+#      define snprintf _snprintf
+#    endif
+#  endif
+#else 
+#  ifdef HAVE_SNPRINTF
+	#undef HAVE_SNPRINTF
+#  endif
 #endif
 
+
+
 /* No `swapcontext' function. */
 #if defined(HAVE_SWAPCONTEXT)
 	#undef HAVE_SWAPCONTEXT
@@ -185,35 +214,20 @@
 #endif
 
 /* The compiler has the `vsnprintf' function. */
-/*#if !defined(HAVE_VSNPRINTF)
+#ifndef HAVE_VSNPRINTF
 	#define HAVE_VSNPRINTF	1
-#endif*/
-
-
-/* enable the asprintf replacement */
-#if !defined(NEED_ASPRINTF)
-	#define NEED_ASPRINTF	1
 #endif
 
-/*#ifdef NEED_ASPRINTF
-#undef NEED_ASPRINTF
-#endif*/
-
 
-/* enable the vasprintf replacement */
-#if  !defined(NEED_VASPRINTF)
-	#define NEED_VASPRINTF	1
+/* disable the asprintf replacement */
+#ifndef NEED_ASPRINTF
+	#define NEED_ASPRINTF	
 #endif
 
-/* "disable the snprintf replacement ( this function is broken on system v only" */
 
-/* FIXME TO ANALYZE */
-#if defined(PREFER_PORTABLE_SNPRINTF)
-	#undef PREFER_PORTABLE_SNPRINTF	
-#endif
-
-#if !defined(PREFER_PORTABLE_SNPRINTF)
-	#define PREFER_PORTABLE_SNPRINTF	
+/* disable the vasprintf replacement */
+#ifndef NEED_VASPRINTF
+	#define NEED_VASPRINTF
 #endif
 
 /* The maximal size of any scalar on this arch */
@@ -303,7 +317,7 @@ the double. For now, GRAS requires the structures to be compacted. */
 	#undef GRAS_THISARCH
 #endif
 
-#define GRAS_THISARCH 0
+#define GRAS_THISARCH 3
 
  
  /* Path to the addr2line tool */
@@ -394,9 +408,6 @@ the double. For now, GRAS requires the structures to be compacted. */
  * Replace winsock2.h,ws2tcpip.h and winsock.h header files */
 #include <windows.h>
 
-/* types */
-typedef unsigned int uint32_t;
-typedef int socklen_t;
 
 /* Choose setjmp as exception implementation */
 #ifndef __EX_MCTX_SJLJ__
@@ -405,5 +416,20 @@ typedef int socklen_t;
 
 
 
+#include <sys/stat.h>
+
+#define S_IWUSR _S_IWRITE
+#define S_IRUSR _S_IREAD
+
+
+/* Visual C++ does not declare the ssize_t type */
+typedef int ssize_t;
+
+/* Visual C++ does not declare the mode_t type */
+typedef unsigned int mode_t;
+
+/* Visual C++ does not declare the uint32_t type */
+typedef unsigned int uint32_t;
+
 
 #endif /* #ifndef __XBT_VISUALC_COMPILER_CONFIG_H__ */