X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86..2b7bf2ece143fd83bafa635a83940f58083e7f18:/src/portable.h diff --git a/src/portable.h b/src/portable.h index 70701e009e..6da75502b1 100644 --- a/src/portable.h +++ b/src/portable.h @@ -1,16 +1,16 @@ /* 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 "gras_config.h" +#include "internal_config.h" #include "xbt/misc.h" /* * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC). @@ -38,34 +38,6 @@ # include #endif -/**** - **** Networking - ****/ - - -#ifdef HAVE_SYS_SOCKET_H -# include -# include /* sometimes required for #include */ -# include /* TCP_NODELAY */ -# include /* getprotobyname() */ -# include /* inet_ntoa() */ -# include /* 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 ****/ @@ -154,10 +126,4 @@ extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, # include #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 */