Mercurial > mxe-octave
view src/openssl-1-winsock2.patch @ 3531:d765eab1691e
bump version to 0.20
This version builds the stable-octave package completely from source
with mingw-w64 for both 32- and 64-bit systems. Currently, 64-bit
systems always use 64-bit indexing for Octave and dependencies.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 17 Feb 2014 01:20:23 -0500 |
| parents | 99516e73b368 |
| children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. This patch has been taken from: http://rt.openssl.org/Ticket/Display.html?id=2285&user=guest&pass=guest diff -urN a/e_os.h b/e_os.h --- a/e_os.h 2010-05-31 15:18:08.000000000 +0200 +++ b/e_os.h 2010-06-04 17:43:44.370181869 +0200 @@ -492,7 +492,7 @@ # endif # if !defined(IPPROTO_IP) /* winsock[2].h was included already? */ -# include <winsock.h> +# include <winsock2.h> # endif # ifdef getservbyname # undef getservbyname diff -urN a/ssl/dtls1.h b/ssl/dtls1.h --- a/ssl/dtls1.h 2010-04-14 02:17:29.000000000 +0200 +++ b/ssl/dtls1.h 2010-06-04 17:44:27.318182412 +0200 @@ -68,7 +68,7 @@ #endif #ifdef OPENSSL_SYS_WIN32 /* Needed for struct timeval */ -#include <winsock.h> +#include <winsock2.h> #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) #include <sys/timeval.h> #else diff -urN a/ssl/ssltest.c b/ssl/ssltest.c --- a/ssl/ssltest.c 2010-01-24 17:57:38.000000000 +0100 +++ b/ssl/ssltest.c 2010-06-04 17:44:26.134181765 +0200 @@ -193,7 +193,7 @@ */ #ifdef OPENSSL_SYS_WINDOWS -#include <winsock.h> +#include <winsock2.h> #else #include OPENSSL_UNISTD #endif