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

diff --git a/src/portable.h b/src/portable.h
index 62ff5d71ca..af3342febd 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -13,9 +13,13 @@
 
 #include "gras_config.h"
 
-#include <errno.h>
-#include <sys/time.h> /* struct timeval */
-#include <sys/types.h>
+#ifdef HAVE_ERRNO_H
+#  include <errno.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 
 /****
  **** Networking 
@@ -87,7 +91,11 @@ const char *gras_wsa_err2string(int errcode);
 #include <fcntl.h>
 
 #ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
+#  include <sys/stat.h>
+#endif
+
+#ifndef O_BINARY
+#  define O_BINARY 0
 #endif
 
 /****
@@ -113,10 +121,26 @@ const char *gras_wsa_err2string(int errcode);
  **** Contexts
  ****/
 
-#ifdef HAVE_UCONTEXT_H
-#  include <ucontext.h>
-#else
+#ifdef USE_UCONTEXT
+# ifndef S_SPLINT_S /* This header drives splint into the wall */
+#   include <ucontext.h>
+# endif 
+#endif
+
+#ifdef _WIN32
 #  include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */
 #endif
 
+/**
+ ** What is needed to protect solaris's printf from ever seing NULL associated to a %s format
+ ** (without adding an extra check on linux :)
+ **/
+
+#ifdef PRINTF_NULL_WORKING
+#  define PRINTF_STR(a) (a)
+#else
+#  define PRINTF_STR(a) (a)?:"(null)"
+#endif
+  
+
 #endif /* GRAS_PORTABLE_H */