X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..c46c0b0d1e605253fa05ccf16251d1a753b3fec7:/src/portable.h diff --git a/src/portable.h b/src/portable.h index fdb6f48bec..6e8f6b7004 100644 --- a/src/portable.h +++ b/src/portable.h @@ -1,11 +1,11 @@ /* portable -- header loading to write portable code */ /* loads much more stuff than sysdep.h since the latter is in public interface*/ -/* Copyright (c) 2004-2010, 2012-2013. The SimGrid Team. +/* Copyright (c) 2004-2010, 2012-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef SIMGRID_PORTABLE_H #define SIMGRID_PORTABLE_H @@ -99,8 +99,8 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, /* 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); +XBT_PUBLIC(int) asprintf(char **ptr, const char *fmt, /*args */ ...); +XBT_PUBLIC(int) vasprintf(char **ptr, const char *fmt, va_list ap); #endif extern int asnprintf(char **ptr, size_t str_m, const char *fmt, /*args */ @@ -108,17 +108,6 @@ 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 - * (without adding an extra check on working platforms :) - */ - -#ifdef PRINTF_NULL_WORKING -# define PRINTF_STR(a) (a) -#else -# define PRINTF_STR(a) (a)?:"(null)" -#endif - /* * What we need to extract the backtrace in exception handling code */