#ifndef GRAS_PORTABLE_H
#define GRAS_PORTABLE_H
-#include "gras_config.h"
+/*
+ * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).
+*/
+#ifdef _WIN32
+# include "win32/config.h"
+# include <windows.h>
+#else
+# include "gras_config.h"
+#endif
#include <stdarg.h>
# include <sys/types.h> /* sometimes required for fd_set */
# endif
-#ifdef HAVE_WINSOCK2_H
-# include <winsock2.h>
-# include <ws2tcpip.h> /* socklen_t, but doubtful */
-# ifndef HAVE_WINSOCK_H
-# define HAVE_WINSOCK_H
-# endif
-#elif HAVE_WINSOCK_H
-# include <winsock.h>
-#endif
-
-#ifdef HAVE_WINSOCK_H
-# define tcp_read( s, buf, len ) recv( s, buf, len, 0 )
-# define tcp_write( s, buf, len ) send( s, buf, len, 0 )
-# define ioctl( s, c, a ) ioctlsocket( (s), (c), (a) )
-# define ioctl_t u_long
-# define AC_SOCKET_INVALID ((unsigned int) ~0)
-
-# ifdef SD_BOTH
-# define tcp_close( s ) (shutdown( s, SD_BOTH ), closesocket( s ))
-# else
-# define tcp_close( s ) closesocket( s )
-# endif
-
-# define EWOULDBLOCK WSAEWOULDBLOCK
-# define EINPROGRESS WSAEINPROGRESS
-# define ETIMEDOUT WSAETIMEDOUT
-
-# undef sock_errno
-# undef sock_errstr
-# define sock_errno WSAGetLastError()
-# define sock_errstr gras_wsa_err2string(WSAGetLastError())
-
-const char *gras_wsa_err2string(int errcode);
-
-# define S_IRGRP 0
-# define S_IWGRP 0
-#else
+#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 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 ))
# endif
#endif
-#ifdef _WIN32
-#define sleep _sleep /* else defined in stdlib.h */
-#endif
/****
**** Contexts
****/
#ifdef USE_UCONTEXT
-# ifndef S_SPLINT_S /* This header drives splint into the wall */
-# include <ucontext.h>
-# endif
+# include <ucontext.h>
#endif
#ifdef _WIN32
# 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??
- */
+/****
+ **** 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);
+const char *hexa_str(unsigned char *data, int size, int downside);
#endif /* GRAS_PORTABLE_H */