X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65fe7ce26905cc6a4e8cc05066817e8eb0779ecc..41e5b29e0df3bdb4a38c15883788861dbb791504:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index a6a02209a9..3b4d34a021 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -11,9 +11,11 @@
 #ifndef GRAS_PORTABLE_H
 #define GRAS_PORTABLE_H
 
+#include "simgrid_config.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>
@@ -21,12 +23,6 @@
 #  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
-#  define _GNU_SOURCE
-#  include <stdio.h>
-#endif
-
 #include <stdarg.h>
 
 #ifdef HAVE_ERRNO_H
@@ -44,11 +40,11 @@
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
-#  include <netinet/in.h>   /* sometimes required for #include <arpa/inet.h> */
-#  include <netinet/tcp.h>  /* TCP_NODELAY */
-#  include <netdb.h>        /* getprotobyname() */
-#  include <arpa/inet.h>    /* inet_ntoa() */
-#  include <sys/types.h>    /* sometimes required for fd_set */
+#  include <netinet/in.h>       /* sometimes required for #include <arpa/inet.h> */
+#  include <netinet/tcp.h>      /* TCP_NODELAY */
+#  include <netdb.h>            /* getprotobyname() */
+#  include <arpa/inet.h>        /* inet_ntoa() */
+#  include <sys/types.h>        /* sometimes required for fd_set */
 # endif
 
 
@@ -106,38 +102,34 @@
  ****/
 
 /* prototype of C99 functions */
-#if defined(HAVE_SNPRINTF) && defined(_MSC_VER)
+#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);
-#  endif
-
+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);
+     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
 #endif
 
 /* prototype of GNU functions  */
-#if !defined(__BORLANDC__) && !defined(_MSC_VER)
-extern int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
-extern int vasprintf (char **ptr, const char *fmt, va_list ap);
+#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);
+     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
@@ -160,7 +152,7 @@ extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
 /****
  **** Some debugging functions. Can't we find a better place for this??
  ****/
-void hexa_print(const char*name, unsigned char *data, int size);
-const char *hexa_str(unsigned char *data, int size, int downside);
+     void hexa_print(const char *name, unsigned char *data, int size);
+     const char *hexa_str(unsigned char *data, int size, int downside);
 
 #endif /* GRAS_PORTABLE_H */