-/* portable -- header loading to write portable code */
-/* loads much more stuff than sysdep.h since the latter is in public interface*/
+/* portable -- header loading to write portable code within SimGrid */
-/* Copyright (c) 2004-2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004, 2016. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#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
+#ifdef _WIN32
# include <windows.h>
#endif
#include <stdarg.h>
#include <stdio.h>
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
# include <sys/sysctl.h>
#endif
-/****
- **** File handling
- ****/
+/* File handling */
#include <fcntl.h>
-#ifdef _XBT_WIN32
+#ifdef _WIN32
#ifndef EWOULDBLOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
#endif
#define S_IWGRP 0
#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
#ifndef O_BINARY
# define O_BINARY 0
#endif
-/****
- **** Time handling
- ****/
-
-#if HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+/* Time handling */
+#include <sys/time.h>
#include <time.h>
-/****
- **** Signals
- ****/
+/* Signals */
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#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
-
-/*
- * 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