X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25d577cd1732a672eb06cb4f24c5b9eacd2df5d0..59a1aff0fbe12fa74b7d0b9fb46492fa7a822acc:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index 0c56508aec..af3342febd 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -121,13 +121,26 @@ const char *gras_wsa_err2string(int errcode);
  **** Contexts
  ****/
 
-#ifdef HAVE_UCONTEXT_H
+#ifdef USE_UCONTEXT
 # ifndef S_SPLINT_S /* This header drives splint into the wall */
 #   include <ucontext.h>
 # endif 
-#else
+#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 */