Rename BEGIN_DECL since we changed the usual definition to a macro with arguments...

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

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 4f65736..2c7c194 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -13,17 +13,21 @@
 
 #include <string.h>
 #include <stdlib.h> 
+#include <stdio.h>
+#include <stdarg.h> /* va_list */
    
 #include "xbt/misc.h"
-#include "xbt/error.h"
+#include "xbt/asserts.h"
   
-BEGIN_DECL()
+SG_BEGIN_DECL()
+
 /** @addtogroup XBT_syscall
  *  @{
  */
 
+#ifdef __GNUC__
 /** @brief like strdup, but xbt_die() on error */
-static __inline__ char *xbt_strdup(const char *s) {
+static inline char *xbt_strdup(const char *s) {
   char *res = NULL;
   if (s) {
     res=strdup(s);
@@ -34,7 +38,7 @@ static __inline__ char *xbt_strdup(const char *s) {
 }
 /** @brief like malloc, but xbt_die() on error 
     @hideinitializer */
-static __inline__ void *xbt_malloc(int n){
+static inline void *xbt_malloc(int n){
   void *res=malloc(n);
   if (!res)
      xbt_die("Memory allocation failed");
@@ -43,7 +47,7 @@ static __inline__ void *xbt_malloc(int n){
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
-static __inline__ void *xbt_malloc0(int n) {
+static inline void *xbt_malloc0(int n) {
   void *res=calloc(n,1);
   if (!res)
      xbt_die("Memory callocation failed");
@@ -52,7 +56,7 @@ static __inline__ void *xbt_malloc0(int n) {
   
 /** @brief like realloc, but xbt_die() on error 
     @hideinitializer */
-static __inline__ void *xbt_realloc(void*p,int s){
+static inline void *xbt_realloc(void*p,int s){
   void *res=res;
   if (s) {
     if (p) {
@@ -69,6 +73,13 @@ static __inline__ void *xbt_realloc(void*p,int s){
   }
   return res;
 }
+#else /* non __GNUC__  */
+#  define xbt_strdup(s)    strdup(s)
+#  define xbt_malloc(n)    malloc(n)
+#  define xbt_malloc0(n)   calloc(n,1)
+#  define xbt_realloc(p,s) realloc(p,s)
+#endif /* __GNUC__ ? */
+
 /** @brief like free
     @hideinitializer */
 #define xbt_free free /*nothing specific to do here. A poor valgrind replacement?*/
@@ -83,6 +94,10 @@ static __inline__ void *xbt_realloc(void*p,int s){
 
 /** @} */  
 
-END_DECL()
+/* FIXME: better place? */
+int vasprintf  (char **ptr, const char *fmt, va_list ap);
+char *bprintf(const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+  
+SG_END_DECL()
 
 #endif /* _XBT_SYSDEP_H */