From b52350bf53c07bb9b589c7f03324033d16dcd604 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 14 Dec 2004 21:01:59 +0000 Subject: [PATCH] Make sure HAVE_WINSOCK_H is defined even if only version 2 since it's the used sentinel; define portable way to retrieve errno and errstr with sockets git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@627 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/portable.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/portable.h b/src/portable.h index 91cdc3860b..15fc63dcab 100644 --- a/src/portable.h +++ b/src/portable.h @@ -33,6 +33,9 @@ #ifdef HAVE_WINSOCK2_H # include # include /* socklen_t, but doubtful */ +# ifndef HAVE_WINSOCK_H +# define HAVE_WINSOCK_H +# endif #elif HAVE_WINSOCK_H # include #endif @@ -56,10 +59,10 @@ # undef sock_errno # undef sock_errstr -# define sock_errno() WSAGetLastError() -# define sock_errstr(e) ber_pvt_wsa_err2string(e) +# define sock_errno WSAGetLastError() +# define sock_errstr gras_wsa_err2string(WSAGetLastError()) -char *ber_pvt_wsa_err2string(int errcode); +const char *gras_wsa_err2string(int errcode); # define S_IRGRP 0 # define S_IWGRP 0 @@ -67,6 +70,8 @@ char *ber_pvt_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) # ifdef SHUT_RDWR # define tcp_close( s ) (shutdown( s, SHUT_RDWR ), close( s )) -- 2.20.1