Commit eadfa019 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

fix PR#2261 in a different way

parent 97999375

crypto/bio/b_sock.c

+7 −0
Original line number Diff line number Diff line
@@ -731,7 +731,14 @@ again: 
#ifdef SO_REUSEADDR

		err_num=get_last_socket_error();

		if ((bind_mode == BIO_BIND_REUSEADDR_IF_UNUSED) &&

#ifdef OPENSSL_SYS_WINDOWS

			/* Some versions of Windows define EADDRINUSE to

			 * a dummy value.

			 */

			(err_num == WSAEADDRINUSE))

#else

			(err_num == EADDRINUSE))

#endif

			{

			client = server;

			if (h == NULL || strcmp(h,"*") == 0)

e_os.h

+0 −4
Original line number Diff line number Diff line
@@ -150,10 +150,6 @@ extern "C" { 
#define clear_socket_error()	WSASetLastError(0)

#define readsocket(s,b,n)	recv((s),(b),(n),0)

#define writesocket(s,b,n)	send((s),(b),(n),0)

#ifdef EADDRINUSE

#undef EADDRINUSE

#endif

#define EADDRINUSE		WSAEADDRINUSE

#elif defined(__DJGPP__)

#define WATT32

#define get_last_socket_error()	errno