From b8bbc1087cd89b120b0004376bf09ef8c6881f42 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Feb 2012 13:44:57 +0100 Subject: [PATCH 1/1] Fix compilation error on windows. --- src/win32/config.h | 4 ++-- src/xbt/xbt_trp_plugin_tcp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/win32/config.h b/src/win32/config.h index 85b3f6c6c4..3d65bb321c 100644 --- a/src/win32/config.h +++ b/src/win32/config.h @@ -67,9 +67,9 @@ typedef int socklen_t; #undef sock_errstr #endif -#define sock_errstr(err) gras_wsa_err2string(err) +#define sock_errstr(err) xbt_wsa_err2string(err) -const char *gras_wsa_err2string(int errcode); +const char *xbt_wsa_err2string(int errcode); #ifdef S_IRGRP #undef S_IRGRP diff --git a/src/xbt/xbt_trp_plugin_tcp.c b/src/xbt/xbt_trp_plugin_tcp.c index 000016d1ac..3c4b38d129 100644 --- a/src/xbt/xbt_trp_plugin_tcp.c +++ b/src/xbt/xbt_trp_plugin_tcp.c @@ -860,7 +860,7 @@ const char *xbt_wsa_err2string(int err) RETSTR(WSANOTINITIALISED); RETSTR(WSAEDISCON); -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H RETSTR(WSAENOMORE); RETSTR(WSAECANCELLED); RETSTR(WSAEINVALIDPROCTABLE); @@ -871,7 +871,7 @@ const char *xbt_wsa_err2string(int err) RETSTR(WSA_E_NO_MORE); RETSTR(WSA_E_CANCELLED); RETSTR(WSAEREFUSED); -#endif /* HAVE_WINSOCK2 */ +#endif /* HAVE_WINSOCK2_H */ RETSTR(WSAHOST_NOT_FOUND); RETSTR(WSATRY_AGAIN); -- 2.20.1