X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c5685dc7dbf80037da524d5787a8265bf36a552..9707c78bfa2c1c693947524ea2b3dfe32f0288c8:/src/portable.h diff --git a/src/portable.h b/src/portable.h index 61a3ea0f43..5e755819d1 100644 --- a/src/portable.h +++ b/src/portable.h @@ -21,6 +21,12 @@ # 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 +#endif + #include #ifdef HAVE_ERRNO_H @@ -73,11 +79,6 @@ # define O_BINARY 0 #endif -#ifdef HAVE_GETLINE -# define _GNU_SOURCE -# include -#endif - /**** **** Time handling ****/ @@ -93,19 +94,6 @@ # endif #endif - -/**** - **** Contexts - ****/ - -#ifdef USE_UCONTEXT -# include -#endif - -#ifdef _WIN32 -# include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */ -#endif - /**** **** Signals ****/ @@ -122,15 +110,15 @@ #include #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); + __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 + __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 #endif @@ -143,8 +131,10 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list #endif /* prototype of GNU functions */ +#ifndef __BORLANDC__ 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);