X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7ca16289c913278988d37c1e2e57bdc93eb16e4..305fbc7b720f845588b22de910245576971a5f97:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index 4cded556b6..aef3db02e7 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -11,16 +11,25 @@
 #ifndef GRAS_PORTABLE_H
 #define GRAS_PORTABLE_H
 
+#include "xbt/misc.h"
 /* 
  * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).	
 */ 
 #ifdef _WIN32
 # include "win32/config.h"
-#  include <windows.h>
+# include <windows.h>
 #else
 #  include "gras_config.h"
 #endif
 
+/* Load this asap to make sure that GNU_SOURCE is defined on need when stdio gets loaded by some random system header */
+#ifdef HAVE_GETLINE
+#  ifndef _GNU_SOUCE
+#    define _GNU_SOURCE
+#  endif
+#  include <stdio.h>
+#endif
+
 #include <stdarg.h>
 
 #ifdef HAVE_ERRNO_H
@@ -88,22 +97,6 @@
 # endif
 #endif
 
-#ifdef _WIN32
-#define sleep _sleep /* else defined in stdlib.h */
-#endif
-
-/****
- **** Contexts
- ****/
-
-#ifdef USE_UCONTEXT
-# include <ucontext.h>
-#endif
-
-#ifdef _WIN32
-#  include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */
-#endif
-
 /****
  **** Signals
  ****/
@@ -116,13 +109,14 @@
  ****/
 
 /* prototype of C99 functions */
-#ifdef HAVE_SNPRINTF
+#if defined(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);
+   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*/ ...);
@@ -132,8 +126,11 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list
 #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);
+#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);