splint'able

[simgrid.git] / src / portable.h

diff --git a/src/portable.h b/src/portable.h
index a3b1866..0c56508 100644 (file)
--- 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 
@@ -118,9 +122,12 @@ const char *gras_wsa_err2string(int errcode);
  ****/
 
 #ifdef HAVE_UCONTEXT_H
-#  include <ucontext.h>
+# ifndef S_SPLINT_S /* This header drives splint into the wall */
+#   include <ucontext.h>
+# endif 
 #else
 #  include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */
 #endif
 
+
 #endif /* GRAS_PORTABLE_H */