#include <windows.h>
-#ifdef HAVE_WINSOCK
+#ifdef HAVE_WINSOCK2
+#include <winsock2.h>
+#elif HAVE_WINSOCK
#include <winsock.h>
+#endif /* HAVE_WINSOCK(2) */
#define __RETSTR( x ) case x: return #x;
#undef __RETSTR
-#endif /* HAVE_WINSOCK */
-
-
char *GetErrorString( int err )
{
static char msgBuf[1024];