A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure HAVE_WINSOCK_H is defined even if only version 2 since it's the used sentin...
[simgrid.git]
/
src
/
portable.h
diff --git
a/src/portable.h
b/src/portable.h
index
91cdc38
..
15fc63d
100644
(file)
--- a/
src/portable.h
+++ b/
src/portable.h
@@
-33,6
+33,9
@@
#ifdef HAVE_WINSOCK2_H
# include <winsock2.h>
# include <ws2tcpip.h> /* socklen_t, but doubtful */
#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
#elif HAVE_WINSOCK_H
# include <winsock.h>
#endif
@@
-56,10
+59,10
@@
# undef sock_errno
# undef sock_errstr
# 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()
)
-c
har *ber_pvt
_wsa_err2string(int errcode);
+c
onst char *gras
_wsa_err2string(int errcode);
# define S_IRGRP 0
# define S_IWGRP 0
# 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 )
#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 ))
# ifdef SHUT_RDWR
# define tcp_close( s ) (shutdown( s, SHUT_RDWR ), close( s ))