diff options
Diffstat (limited to 'patches/windows_headers.patch')
-rw-r--r-- | patches/windows_headers.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index e8b4022..5d216fb 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch | |||
@@ -4,36 +4,35 @@ diff -u include/openssl.orig/dtls1.h include/openssl/dtls1.h | |||
4 | @@ -60,7 +60,11 @@ | 4 | @@ -60,7 +60,11 @@ |
5 | #ifndef HEADER_DTLS1_H | 5 | #ifndef HEADER_DTLS1_H |
6 | #define HEADER_DTLS1_H | 6 | #define HEADER_DTLS1_H |
7 | 7 | ||
8 | +#if defined(_WIN32) | 8 | +#if defined(_WIN32) |
9 | +#include <winsock2.h> | 9 | +#include <winsock2.h> |
10 | +#else | 10 | +#else |
11 | #include <sys/time.h> | 11 | #include <sys/time.h> |
12 | +#endif | 12 | +#endif |
13 | 13 | ||
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | #include <stdlib.h> | 15 | #include <stdlib.h> |
16 | diff -u include/openssl.orig/opensslconf.h include/openssl/opensslconf.h | 16 | --- include/openssl/opensslconf.h.orig Sat Nov 5 08:36:25 2016 |
17 | --- include/openssl.orig/opensslconf.h Mon Dec 7 07:58:32 2015 | 17 | +++ include/openssl/opensslconf.h Mon Jul 17 06:06:58 2017 |
18 | +++ include/openssl/opensslconf.h Mon Dec 7 07:56:14 2015 | ||
19 | @@ -1,6 +1,10 @@ | 18 | @@ -1,6 +1,10 @@ |
20 | #include <openssl/opensslfeatures.h> | 19 | #include <openssl/opensslfeatures.h> |
21 | /* crypto/opensslconf.h.in */ | 20 | /* crypto/opensslconf.h.in */ |
22 | 21 | ||
23 | +#if defined(_MSC_VER) && !defined(__attribute__) | 22 | +#if defined(_MSC_VER) && !defined(__attribute__) |
24 | +#define __attribute__(a) | 23 | +#define __attribute__(a) |
25 | +#endif | 24 | +#endif |
26 | + | 25 | + |
27 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) | 26 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) |
28 | #define OPENSSLDIR "/etc/ssl" | 27 | #define OPENSSLDIR "/etc/ssl" |
29 | 28 | #endif | |
30 | diff -u include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h | 29 | diff -u include/openssl.orig/ossl_typ.h include/openssl/ossl_typ.h |
31 | --- include/openssl.orig/ossl_typ.h Mon Dec 7 07:58:32 2015 | 30 | --- include/openssl.orig/ossl_typ.h Mon Dec 7 07:58:32 2015 |
32 | +++ include/openssl/ossl_typ.h Mon Dec 7 07:56:14 2015 | 31 | +++ include/openssl/ossl_typ.h Mon Dec 7 07:56:14 2015 |
33 | @@ -80,6 +80,22 @@ | 32 | @@ -80,6 +80,22 @@ |
34 | typedef struct ASN1_ITEM_st ASN1_ITEM; | 33 | typedef struct ASN1_ITEM_st ASN1_ITEM; |
35 | typedef struct asn1_pctx_st ASN1_PCTX; | 34 | typedef struct asn1_pctx_st ASN1_PCTX; |
36 | 35 | ||
37 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | 36 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) |
38 | +#ifndef LIBRESSL_INTERNAL | 37 | +#ifndef LIBRESSL_INTERNAL |
39 | +#ifdef _MSC_VER | 38 | +#ifdef _MSC_VER |
@@ -59,7 +58,7 @@ diff -u include/openssl.orig/pkcs7.h include/openssl/pkcs7.h | |||
59 | @@ -69,6 +69,18 @@ | 58 | @@ -69,6 +69,18 @@ |
60 | extern "C" { | 59 | extern "C" { |
61 | #endif | 60 | #endif |
62 | 61 | ||
63 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | 62 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) |
64 | +#ifndef LIBRESSL_INTERNAL | 63 | +#ifndef LIBRESSL_INTERNAL |
65 | +#ifdef _MSC_VER | 64 | +#ifdef _MSC_VER |
@@ -81,7 +80,7 @@ diff -u include/openssl.orig/x509.h include/openssl/x509.h | |||
81 | @@ -112,6 +112,19 @@ | 80 | @@ -112,6 +112,19 @@ |
82 | extern "C" { | 81 | extern "C" { |
83 | #endif | 82 | #endif |
84 | 83 | ||
85 | +#if defined(_WIN32) | 84 | +#if defined(_WIN32) |
86 | +#ifndef LIBRESSL_INTERNAL | 85 | +#ifndef LIBRESSL_INTERNAL |
87 | +#ifdef _MSC_VER | 86 | +#ifdef _MSC_VER |