X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8b5e623ecad573ef13267bd304777462993efdb..8465282253954c58d16cb5dae9a5d064eada3329:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index f18a87865f..6e8f6b7004 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,14 +1,14 @@
 /* portable -- header loading to write portable code                         */
 /* loads much more stuff than sysdep.h since the latter is in public interface*/
 
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* 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 "internal_config.h"
 #include "xbt/misc.h"
@@ -38,34 +38,6 @@
 # include <sys/sysctl.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 ? */
-
 /****
  **** File handling
  ****/
@@ -127,8 +99,8 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
 
 /* 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 */
@@ -136,17 +108,6 @@ 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
-
 /*
  * What we need to extract the backtrace in exception handling code
  */
@@ -154,10 +115,4 @@ extern int vasnprintf(char **ptr, size_t str_m, const char *fmt,
 #  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 */