X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa5a11b84f7953b5b030e9996c47b890b27785d6..56417ff927246c7dd199fbebda6a49bc34f27950:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index a4d4f349c5..aef3db02e7 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -11,6 +11,7 @@
 #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).	
 */ 
@@ -23,7 +24,9 @@
 
 /* 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
-#  define _GNU_SOURCE
+#  ifndef _GNU_SOUCE
+#    define _GNU_SOURCE
+#  endif
 #  include <stdio.h>
 #endif
 
@@ -106,21 +109,13 @@
  ****/
 
 /* prototype of C99 functions */
-#ifdef HAVE_SNPRINTF
+#if defined(HAVE_SNPRINTF)
 #include <stdio.h>
 #else
-#  if (defined(_MSC_VER) && defined(DLL_EXPORT))
-    __declspec(dllexport) int snprintf(char *, size_t, const char *, /*args*/ ...);
-    __declspec(dllexport)  int vsnprintf(char *, size_t, const char *, va_list);
-#  elif (defined(_MSC_VER) && !defined(DLL_EXPORT) && !defined(DLL_STATIC) )
-    __declspec(dllimport) int snprintf(char *, size_t, const char *, /*args*/ ...);
-    __declspec(dllimport)  int vsnprintf(char *, size_t, const char *, va_list);
-#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
 
-#endif
 
 /* use internal functions when OS provided ones are borken */
 #if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF)
@@ -131,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);