X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a59a47d79fe092f559a4a03de102402d7085bca9..954676b700e711f38ec4d286d33d5427d3f4ca46:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index c4caaf9a7c..d3d435ba7d 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,7 +1,7 @@
 /* portable -- header loading to write portable code                         */
 /* loads much more stuff than sysdep.h since the latter is in public interface*/
 
-/* Copyright (c) 2004-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2004-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,12 +11,9 @@
 #define SIMGRID_PORTABLE_H
 
 #include "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
 
@@ -44,6 +41,30 @@
 
 #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
@@ -56,16 +77,10 @@
  **** 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
@@ -89,9 +104,9 @@ XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list);
 
 /* 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
@@ -108,17 +123,6 @@ extern int asnprintf(char **ptr, size_t str_m, const char *fmt, /*args */
 extern int vasnprintf(char **ptr, size_t str_m, const char *fmt,
                       va_list ap);
 
-/*
- * That's needed to protect solaris's printf from ever seing NULL associated to a %s format
- * (without adding an extra check on working platforms :)
- */
-
-#ifdef PRINTF_NULL_WORKING
-#  define PRINTF_STR(a) (a)
-#else
-#  define PRINTF_STR(a) (a)?:"(null)"
-#endif
-
 /*
  * What we need to extract the backtrace in exception handling code
  */