#ifndef SIMGRID_PORTABLE_H
#define SIMGRID_PORTABLE_H
-#include "internal_config.h"
+#include "src/internal_config.h"
+#include "xbt/base.h"
#include "xbt/misc.h"
-/*
- * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).
-*/
#ifdef _XBT_WIN32
-# include "win32/config.h"
# include <windows.h>
#endif
#include <fcntl.h>
+#ifdef _XBT_WIN32
+ #ifndef EWOULDBLOCK
+ #define EWOULDBLOCK WSAEWOULDBLOCK
+ #endif
+
+ #ifndef EINPROGRESS
+ #define EINPROGRESS WSAEINPROGRESS
+ #endif
+
+ #ifndef ETIMEDOUT
+ #define ETIMEDOUT WSAETIMEDOUT
+ #endif
+
+ #ifdef S_IRGRP
+ #undef S_IRGRP
+ #endif
+ #define S_IRGRP 0
+
+ #ifdef S_IWGRP
+ #undef S_IWGRP
+ #endif
+ #define S_IWGRP 0
+#endif
+
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
**** Time handling
****/
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H
# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
+#include <time.h>
/****
**** Signals
/* use internal functions when OS provided ones are borken */
#if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF)
-extern int portable_snprintf(char *str, size_t str_m, const char *fmt,
+XBT_PRIVATE int portable_snprintf(char *str, size_t str_m, const char *fmt,
/*args */ ...);
-extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
+XBT_PRIVATE int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
va_list ap);
#define snprintf portable_snprintf
#define vsnprintf portable_vsnprintf