-/* 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, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SIMGRID_PORTABLE_H
#define SIMGRID_PORTABLE_H
-#include "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"
-/*
- * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).
-*/
-#ifdef _XBT_WIN32
-# include "win32/config.h"
+#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 HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#ifdef _WIN32
+ #ifndef EWOULDBLOCK
+ #define EWOULDBLOCK WSAEWOULDBLOCK
+ #endif
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
+ #ifndef EINPROGRESS
+ #define EINPROGRESS WSAEINPROGRESS
+ #endif
-/****
- **** Time handling
- ****/
-
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
+ #ifndef ETIMEDOUT
+ #define ETIMEDOUT WSAETIMEDOUT
+ #endif
-/****
- **** Signals
- ****/
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
+ #ifdef S_IRGRP
+ #undef S_IRGRP
+ #endif
+ #define S_IRGRP 0
-/****
- **** 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)
-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
+ #ifdef S_IWGRP
+ #undef S_IWGRP
+ #endif
+ #define S_IWGRP 0
#endif
-/* prototype of GNU functions */
-#if (defined(__GNUC__) && !defined(__cplusplus))
-extern int asprintf(char **ptr, const char *fmt, /*args */ ...);
-extern int vasprintf(char **ptr, const char *fmt, va_list ap);
+#ifndef O_BINARY
+# define O_BINARY 0
#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);
-
-/*
- * 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 :)
- */
+/* Time handling */
+#include <sys/time.h>
+#include <time.h>
-#ifdef PRINTF_NULL_WORKING
-# define PRINTF_STR(a) (a)
-#else
-# define PRINTF_STR(a) (a)?:"(null)"
+/* Signals */
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
#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
