X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55be6c01c1ff0830eb948602c09dbb9f4344e466..22b96fa759d3b97167b2eb450d35f45cb7827bd7:/include/xbt/sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 524bfb2bff..fd1ecf0726 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -13,7 +13,6 @@
 
 #include <string.h>
 #include <stdlib.h> 
-#include <stdio.h>
 #include <stdarg.h> /* va_list */
    
 #include "xbt/misc.h"
@@ -21,15 +20,6 @@
   
 SG_BEGIN_DECL()
 
-/* FIXME: better place? */
-extern int   asprintf  (char **ptr, const char *fmt, /*args*/ ...) _XBT_GNUC_PRINTF(2,3);
-extern int vasprintf (char **ptr, const char *fmt, va_list ap);
-XBT_PUBLIC(char*) bprintf   (const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
-
-#if defined(_WIN32) || !defined(__GNUC__)
-XBT_PUBLIC(long) getline(char **lineptr, size_t *n, FILE *stream);
-#endif
-
 /* They live in asserts.h, but need to be declared before this module.
    double declaration to cut dependency cycle */
 /**
@@ -41,6 +31,14 @@ XBT_PUBLIC(void) xbt_abort(void) _XBT_GNUC_NORETURN;
 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 */
+#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
  *  @brief Malloc and associated functions, killing the program on error (with \ref XBT_ex)
  *
@@ -60,7 +58,7 @@ static XBT_INLINE char *xbt_strdup(const char *s) {
 }
 /** @brief Like malloc, but xbt_die() on error 
     @hideinitializer */
-static XBT_INLINE void *xbt_malloc(int n){
+static XBT_INLINE void *xbt_malloc(unsigned int n){
   void *res=malloc(n);
   if (!res)
      xbt_die(bprintf("Memory allocation of %d bytes failed",n));
@@ -69,7 +67,7 @@ static XBT_INLINE void *xbt_malloc(int n){
 
 /** @brief like malloc, but xbt_die() on error and memset data to 0
     @hideinitializer */
-static XBT_INLINE void *xbt_malloc0(int n) {
+static XBT_INLINE void *xbt_malloc0(unsigned int n) {
   void *res=calloc(n,1);
   if (!res)
      xbt_die(bprintf("Memory callocation of %d bytes failed",n));
@@ -78,7 +76,7 @@ static XBT_INLINE void *xbt_malloc0(int n) {
   
 /** @brief like realloc, but xbt_die() on error 
     @hideinitializer */
-static XBT_INLINE void *xbt_realloc(void*p,int s){
+static XBT_INLINE void *xbt_realloc(void*p,unsigned int s){
   void *res=res;
   if (s) {
     if (p) {