Damn. The order of events changed again in surf. Revalidate once again

[simgrid.git] / include / xbt / sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 96613ca..a0421e4 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -33,8 +33,10 @@ XBT_PUBLIC(void) xbt_die(const char *msg) _XBT_GNUC_NORETURN;
 
 /* these ones live in str.h, but redeclare them here so that we do 
    not need to load the whole str.h and its heavy dependencies */
-XBT_PUBLIC(int) asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
-XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap);
+#ifndef __USE_GNU /* do not redeclare existing headers */
+  XBT_PUBLIC(int) asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
+  XBT_PUBLIC(int) vasprintf (char **ptr, const char *fmt, va_list ap);
+#endif
 XBT_PUBLIC(char*) bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
 
 /** @addtogroup XBT_syscall
@@ -103,9 +105,10 @@ static XBT_INLINE void *xbt_realloc(void*p,unsigned int s){
 #define xbt_free free /*nothing specific to do here. A poor valgrind replacement?*/
 /*#define xbt_free_fct free * replacement with the guareenty of being a function  FIXME:KILLME*/
 
-/** @brief like free 
-    @hideinitializer */
+/** @brief like free, but you can be sure that it is a function  */
 XBT_PUBLIC(void) xbt_free_f(void* p);
+/** @brief should be given a pointer to pointer, and frees the second one */
+XBT_PUBLIC(void) xbt_free_ref(void *d);
 
 /** @brief like calloc, but xbt_die() on error and don't memset to 0
     @hideinitializer */