X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5bedf2dbd161f416298d57e63707cc450d63964b..34a382cec766ccc54c79cc6183632d7d55887111:/src/portable.h diff --git a/src/portable.h b/src/portable.h index bde3a5e7a8..3b4d34a021 100644 --- a/src/portable.h +++ b/src/portable.h @@ -11,12 +11,14 @@ #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). -*/ -#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__) +*/ +#ifdef _WIN32 # include "win32/config.h" -# include +# include #else # include "gras_config.h" #endif @@ -38,11 +40,11 @@ #ifdef HAVE_SYS_SOCKET_H # include -# include /* sometimes required for #include */ -# include /* TCP_NODELAY */ -# include /* getprotobyname() */ -# include /* inet_ntoa() */ -# include /* sometimes required for fd_set */ +# include /* sometimes required for #include */ +# include /* TCP_NODELAY */ +# include /* getprotobyname() */ +# include /* inet_ntoa() */ +# include /* sometimes required for fd_set */ # endif @@ -88,22 +90,6 @@ # endif #endif -#ifdef _WIN32 -#define sleep _sleep /* else defined in stdlib.h */ -#endif - -/**** - **** Contexts - ****/ - -#ifdef USE_UCONTEXT -# include -#endif - -#ifdef _WIN32 -# include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */ -#endif - /**** **** Signals ****/ @@ -116,26 +102,34 @@ ****/ /* prototype of C99 functions */ -#ifdef HAVE_SNPRINTF +#if defined(HAVE_SNPRINTF) #include #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*/ ...); -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 */ -extern int asprintf (char **ptr, const char *fmt, /*args*/ ...); -extern int vasprintf (char **ptr, 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); +#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); /* * That's needed to protect solaris's printf from ever seing NULL associated to a %s format @@ -158,34 +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); - -/* 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 + 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 */