# 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
#ifdef HAVE_WINSOCK2_H
# undef sock_errno
# undef sock_errstr
-# define sock_errno WSAGetLastError()
-# define sock_errstr gras_wsa_err2string(WSAGetLastError())
+# define sock_errno WSAGetLastError()
+# define sock_errstr(err) gras_wsa_err2string(err)
const char *gras_wsa_err2string(int errcode);
#else
# 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 strerror(errno)
+# define sock_errno errno
+# define sock_errstr(err) strerror(err)
# ifdef SHUT_RDWR
# define tcp_close( s ) (shutdown( s, SHUT_RDWR ), close( s ))
# include "xbt/context_win32.h" /* Manual reimplementation for prehistoric platforms */
#endif
+/****
+ **** Signals
+ ****/
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+
/****
**** string handling (parts from http://www.ijs.si/software/snprintf/)
****/
# 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 */