X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc998ae9ad7bfda536bdaae9871c090ca00dadb8..98781dae46f55f15fe12a1b4c347d4c9b58d97eb:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index 235105bc58..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).	
 */ 
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
+#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,24 +97,6 @@
 # endif
 #endif
 
-#ifdef _WIN32
-#define sleep _sleep /* else defined in stdlib.h */
-#endif
-
-/****
- **** Contexts
- ****/
-
-#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
-
 /****
  **** Signals
  ****/
@@ -118,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*/ ...);
@@ -134,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);
 
@@ -163,31 +158,4 @@ extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
 void hexa_print(const char*name, unsigned char *data, int size);
 const char *hexa_str(unsigned char *data, int size, int downside);
 
-/* Windows __declspec(). */
-#if defined (_XBT_USE_DECLSPEC) /* using export/import technique */
-
-#    ifndef _XBT_EXPORT_DECLSPEC
-#        define _XBT_EXPORT_DECLSPEC
-#    endif
-
-#    ifndef _XBT_IMPORT_DECLSPEC
-#        define _XBT_IMPORT_DECLSPEC
-#    endif
-
-#    if defined (_XBT_DESIGNATED_DLL) /* this is a lib which will contain xbt exports */
-#        define  _XBT_DECLSPEC        _XBT_EXPORT_DECLSPEC 
-#    else
-#        define  _XBT_DECLSPEC        _XBT_IMPORT_DECLSPEC   /* other modules, importing xbt exports */
-#    endif
-
-#else /* not using DLL export/import specifications */
-
-#    define _XBT_DECLSPEC
-
-#endif /* #if defined (_XBT_USE_DECLSPEC) */
-
-#if !defined (_XBT_CALL)
-#define _XBT_CALL
-#endif
-
 #endif /* GRAS_PORTABLE_H */