A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The configuration file visualc.h is change to declare the _WIN32_WINNT macro before...
[simgrid.git]
/
src
/
win32
/
compiler
/
visualc.h
diff --git
a/src/win32/compiler/visualc.h
b/src/win32/compiler/visualc.h
index
adb8905
..
27cce6c
100644
(file)
--- a/
src/win32/compiler/visualc.h
+++ b/
src/win32/compiler/visualc.h
@@
-14,6
+14,15
@@
#include <win32/platform/select_platform_features.h>
#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.
*/
/*
* include files.
*/
@@
-164,11
+173,31
@@
#undef HAVE_SIGNAL
#endif
#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. */
/* The compiler has `snprintf' function. */
-#ifndef HAVE_SNPRINTF
- #define 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
#endif
+
+
/* No `swapcontext' function. */
#if defined(HAVE_SWAPCONTEXT)
#undef HAVE_SWAPCONTEXT
/* No `swapcontext' function. */
#if defined(HAVE_SWAPCONTEXT)
#undef HAVE_SWAPCONTEXT
@@
-201,13
+230,6
@@
#define NEED_VASPRINTF
#endif
#define NEED_VASPRINTF
#endif
-/* "disable the snprintf replacement ( this function is broken on system v only" */
-
-
-#if !defined(PREFER_PORTABLE_SNPRINTF)
- #define PREFER_PORTABLE_SNPRINTF
-#endif
-
/* The maximal size of any scalar on this arch */
#if !defined(SIZEOF_MAX)
#define SIZEOF_MAX 8
/* The maximal size of any scalar on this arch */
#if !defined(SIZEOF_MAX)
#define SIZEOF_MAX 8
@@
-386,8
+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>
* Replace winsock2.h,ws2tcpip.h and winsock.h header files */
#include <windows.h>
-/* types */
-typedef unsigned int uint32_t;
/* Choose setjmp as exception implementation */
#ifndef __EX_MCTX_SJLJ__
/* Choose setjmp as exception implementation */
#ifndef __EX_MCTX_SJLJ__
@@
-395,6
+415,21
@@
typedef unsigned int uint32_t;
#endif
#endif
+
+#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;
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__ */
#endif /* #ifndef __XBT_VISUALC_COMPILER_CONFIG_H__ */