This commit breaks the simgrid-java execution; Revert "Avoid unnecessary loop."

[simgrid.git] / src / portable.h

diff --git a/src/portable.h b/src/portable.h
index 7a71ee0..70701e0 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -10,19 +10,18 @@
 #ifndef GRAS_PORTABLE_H
 #define GRAS_PORTABLE_H
 
-#include "simgrid_config.h"
+#include "gras_config.h"
 #include "xbt/misc.h"
 /* 
- * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).        
+ * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).
 */
-#ifdef _WIN32
+#ifdef _XBT_WIN32
 # include "win32/config.h"
 # include <windows.h>
-#else
-#  include "gras_config.h"
 #endif
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #ifdef HAVE_ERRNO_H
 #  include <errno.h>
@@ -32,6 +31,13 @@
 #  include <unistd.h>
 #endif
 
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
+
 /****
  **** Networking 
  ****/
@@ -58,7 +64,7 @@
 #       else
 #               define tcp_close( s )   close( s )
 #       endif
-#endif /* windows or unix ? */
+#endif                          /* windows or unix ? */
 
 /****
  **** File handling
@@ -111,24 +117,24 @@ XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list);
 
 /* use internal functions when OS provided ones are borken */
 #if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF)
-     extern int portable_snprintf(char *str, size_t str_m, const char *fmt,
-                                  /*args */ ...);
-     extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
-                                   va_list ap);
+extern int portable_snprintf(char *str, size_t str_m, const char *fmt,
+                             /*args */ ...);
+extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
+                              va_list ap);
 #define snprintf  portable_snprintf
 #define vsnprintf portable_vsnprintf
 #endif
 
 /* 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);
+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);
+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
@@ -151,7 +157,7 @@ XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list);
 /****
  **** Some debugging functions. Can't we find a better place for this??
  ****/
-     void hexa_print(const char *name, unsigned char *data, int size);
-     const char *hexa_str(unsigned char *data, int size, int downside);
+void hexa_print(const char *name, unsigned char *data, int size);
+const char *hexa_str(unsigned char *data, int size, int downside);
 
-#endif /* GRAS_PORTABLE_H */
+#endif                          /* GRAS_PORTABLE_H */