X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c43ae9ee22282eaf8c644b7cf8ba2d4c357ee21..c46c0b0d1e605253fa05ccf16251d1a753b3fec7:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index 3b4d34a021..6e8f6b7004 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,29 +1,27 @@
-/* $Id$ */
-
 /* portable -- header loading to write portable code                         */
 /* loads much more stuff than sysdep.h since the latter is in public interface*/
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                   */
+/* 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 GRAS_PORTABLE_H
-#define GRAS_PORTABLE_H
+#ifndef SIMGRID_PORTABLE_H
+#define SIMGRID_PORTABLE_H
 
-#include "simgrid_config.h"
+#include "internal_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>
@@ -33,33 +31,12 @@
 #  include <unistd.h>
 #endif
 
-/****
- **** Networking 
- ****/
-
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#  include <netinet/in.h>       /* sometimes required for #include <arpa/inet.h> */
-#  include <netinet/tcp.h>      /* TCP_NODELAY */
-#  include <netdb.h>            /* getprotobyname() */
-#  include <arpa/inet.h>        /* inet_ntoa() */
-#  include <sys/types.h>        /* sometimes required for fd_set */
-# endif
-
-
-#ifndef HAVE_WINSOCK_H
-#       define tcp_read( s, buf, len)   read( s, buf, len )
-#       define tcp_write( s, buf, len)  write( s, buf, len )
-#       define sock_errno        errno
-#       define sock_errstr(err)  strerror(err)
-
-#       ifdef SHUT_RDWR
-#               define tcp_close( s )   (shutdown( s, SHUT_RDWR ), close( s ))
-#       else
-#               define tcp_close( s )   close( s )
-#       endif
-#endif /* windows or unix ? */
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_SYSCTL_H
+# include <sys/sysctl.h>
+#endif
 
 /****
  **** File handling
@@ -112,35 +89,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);
+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 */
-                          ...);
-     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
+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);
 
 /*
  * What we need to extract the backtrace in exception handling code
@@ -149,10 +115,4 @@ XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list);
 #  include <execinfo.h>
 #endif
 
-/****
- **** 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);
-
-#endif /* GRAS_PORTABLE_H */
+#endif                          /* SIMGRID_PORTABLE_H */