aboutsummaryrefslogtreecommitdiff
path: root/patches/openssl.c.patch
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2014-07-10 22:06:10 -0500
committerBrent Cook <bcook@openbsd.org>2015-07-21 12:08:18 -0500
commit5d8a1cf7155130bd8101090d7e1d0c2f90d9b123 (patch)
tree286f7d12e3647f94bd1e6e8e180a4bf6215a0740 /patches/openssl.c.patch
parent7a4a37cf596697ae96eeb1c555989e6d1a443187 (diff)
downloadportable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.gz
portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.bz2
portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.zip
add initial CMake and Visual Studio build support
This moves the compatibility include files from include to include/compat so we can use the awful MS C compiler <../include/> trick to emulate the GNU #include_next extension. This also removes a few old compat files we do not need anymore.
Diffstat (limited to 'patches/openssl.c.patch')
-rw-r--r--patches/openssl.c.patch27
1 files changed, 19 insertions, 8 deletions
diff --git a/patches/openssl.c.patch b/patches/openssl.c.patch
index c086ba5..275e9ea 100644
--- a/patches/openssl.c.patch
+++ b/patches/openssl.c.patch
@@ -1,10 +1,11 @@
1--- apps/openssl.c.orig 2015-06-05 03:42:12.956112944 -0500 1--- apps/openssl.c.orig 2015-07-20 02:01:42.000000000 -0600
2+++ apps/openssl.c 2015-06-05 03:41:54.215381908 -0500 2+++ apps/openssl.c 2015-07-20 02:02:00.000000000 -0600
3@@ -130,6 +130,18 @@ 3@@ -130,6 +130,19 @@
4 #include <openssl/engine.h> 4 #include <openssl/engine.h>
5 #endif 5 #endif
6 6
7+#ifdef _WIN32 7+#ifdef _WIN32
8+#include <io.h>
8+#include <fcntl.h> 9+#include <fcntl.h>
9+static void set_stdio_binary(void) 10+static void set_stdio_binary(void)
10+{ 11+{
@@ -18,12 +19,22 @@
18+ 19+
19 #include "progs.h" 20 #include "progs.h"
20 #include "s_apps.h" 21 #include "s_apps.h"
21 22
22@@ -216,6 +228,7 @@ 23@@ -204,7 +216,9 @@
24 static void
25 openssl_startup(void)
26 {
27+#ifndef _WIN32
28 signal(SIGPIPE, SIG_IGN);
29+#endif
30
31 CRYPTO_malloc_init();
32 OpenSSL_add_all_algorithms();
33@@ -216,6 +230,7 @@
23 #endif 34 #endif
24 35
25 setup_ui_method(); 36 setup_ui_method();
26+ set_stdio_binary(); 37+ set_stdio_binary();
27 } 38 }
28 39
29 static void 40 static void