Fix compilation error on windows.

diff --git a/src/win32/config.h b/src/win32/config.h
index 85b3f6c..3d65bb3 100644 (file)
--- a/src/win32/config.h
+++ b/src/win32/config.h
@@ -67,9 +67,9 @@ typedef int socklen_t;
 #undef  sock_errstr
 #endif
 
 #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
 
 #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 000016d..3c4b38d 100644 (file)
--- 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);
 
     RETSTR(WSANOTINITIALISED);
     RETSTR(WSAEDISCON);
 

-#ifdef HAVE_WINSOCK2
+#ifdef HAVE_WINSOCK2_H

     RETSTR(WSAENOMORE);
     RETSTR(WSAECANCELLED);
     RETSTR(WSAEINVALIDPROCTABLE);
     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);
     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);
 
     RETSTR(WSAHOST_NOT_FOUND);
     RETSTR(WSATRY_AGAIN);