A few more tiers file and a convenient perl script for the alnem project. I

[simgrid.git] / src / portable.h

diff --git a/src/portable.h b/src/portable.h
index a3b1866..2afe77c 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -13,9 +13,15 @@
 
 #include "gras_config.h"
 
-#include <errno.h>
-#include <sys/time.h> /* struct timeval */
-#include <sys/types.h>
+#include <stdarg.h>
+
+#ifdef HAVE_ERRNO_H
+#  include <errno.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 
 /****
  **** Networking 
@@ -28,6 +34,7 @@
 #  include <netinet/tcp.h>  /* TCP_NODELAY */
 #  include <netdb.h>        /* getprotobyname() */
 #  include <arpa/inet.h>    /* inet_ntoa() */
+#  include <sys/types.h>    /* sometimes required for fd_set */
 # endif
 
 #ifdef HAVE_WINSOCK2_H
@@ -117,10 +124,64 @@ 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
 
+/****
+ **** string handling (parts from http://www.ijs.si/software/snprintf/)
+ ****/
+
+/* prototype of C99 functions */
+#ifdef HAVE_SNPRINTF
+#include <stdio.h>
+#else
+extern int snprintf(char *, size_t, const char *, /*args*/ ...);
+extern int vsnprintf(char *, size_t, const char *, va_list);
+#endif
+
+/* 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, /*args*/ ...);
+extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap);
+#define snprintf  portable_snprintf
+#define vsnprintf portable_vsnprintf
+#endif
+
+/* prototype of GNU functions  */
+extern int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
+extern int vasprintf (char **ptr, const char *fmt, va_list ap);
+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
+ */
+#ifdef HAVE_EXECINFO_H
+#  include <execinfo.h>
+#endif
+
+/*
+ * Some debugging functions. Can't we find a better place for this??
+ */
+void hexa_print(const char*name, unsigned char *data, int size);
+const char *hexa_str(unsigned char *data, int size);
+
 #endif /* GRAS_PORTABLE_H */