#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
RETSTR(WSANOTINITIALISED);
RETSTR(WSAEDISCON);
-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H
RETSTR(WSAENOMORE);
RETSTR(WSAECANCELLED);
RETSTR(WSAEINVALIDPROCTABLE);
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);