#ifndef SIMGRID_PORTABLE_H
#define SIMGRID_PORTABLE_H
-#include "src/internal_config.h"
+#include "simgrid_config.h" /* what was compiled in? */
+#include "src/internal_config.h" /* some information about the environment */
+
#include "xbt/base.h"
#include "xbt/misc.h"
#ifdef _XBT_WIN32
#include <stdarg.h>
#include <stdio.h>
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#define S_IWGRP 0
#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
#ifndef O_BINARY
# define O_BINARY 0
#endif
# include <signal.h>
#endif
-/****
- **** string handling (parts from http://www.ijs.si/software/snprintf/)
- ****/
-
-/* prototype of C99 functions */
-#if defined(HAVE_SNPRINTF)
-#include <stdio.h>
-#else
-XBT_PUBLIC(int) snprintf(char *, size_t, const char *, /*args */ ...);
-XBT_PUBLIC(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)
-XBT_PRIVATE int portable_snprintf(char *str, size_t str_m, const char *fmt,
- /*args */ ...);
-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
-#endif
-
-/* prototype of GNU functions */
-#if (defined(__GNUC__) && !defined(__cplusplus))
-XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */ ...);
-XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap);
-#endif
-
-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);
-
-/*
- * What we need to extract the backtrace in exception handling code
- */
+/* What we need to extract the backtrace in exception handling code */
#ifdef HAVE_EXECINFO_H
# include <execinfo.h>
#endif