aboutsummaryrefslogtreecommitdiff
path: root/apps/openssl
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-10-18 09:28:10 -0500
committerBrent Cook <bcook@openbsd.org>2015-10-18 09:28:10 -0500
commit0197a589691274055e3a6f47a3652a6714d676bc (patch)
tree9a2c16f2cb86605522ce747c1a71bfd0c23db389 /apps/openssl
parentc8918dd0be1bbadfcebfc6631bd63f3b3e83befd (diff)
downloadportable-0197a589691274055e3a6f47a3652a6714d676bc.tar.gz
portable-0197a589691274055e3a6f47a3652a6714d676bc.tar.bz2
portable-0197a589691274055e3a6f47a3652a6714d676bc.zip
Windows compatibility fixes
VS2013 has trouble with relative include paths for apps/openssl, so move certhash_win/apps_win.c back to apps/openssl. gmtime_r on mingw64 fails with negative time_t, override gmtime_s fails all of the time unit tests, override SHUT_RD/WR are defined in newer mingw64 headers, check before overriding
Diffstat (limited to 'apps/openssl')
-rw-r--r--apps/openssl/Makefile.am4
-rw-r--r--apps/openssl/apps_win.c (renamed from apps/openssl/compat/apps_win.c)2
-rw-r--r--apps/openssl/certhash_win.c (renamed from apps/openssl/compat/certhash_win.c)0
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 5a8d458..6ec3d62 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -60,11 +60,11 @@ openssl_SOURCES += x509.c
60if BUILD_CERTHASH 60if BUILD_CERTHASH
61openssl_SOURCES += certhash.c 61openssl_SOURCES += certhash.c
62else 62else
63openssl_SOURCES += compat/certhash_win.c 63openssl_SOURCES += certhash_win.c
64endif 64endif
65 65
66if HOST_WIN 66if HOST_WIN
67openssl_SOURCES += compat/apps_win.c 67openssl_SOURCES += apps_win.c
68else 68else
69openssl_SOURCES += apps_posix.c 69openssl_SOURCES += apps_posix.c
70endif 70endif
diff --git a/apps/openssl/compat/apps_win.c b/apps/openssl/apps_win.c
index bc999f6..37bfcc9 100644
--- a/apps/openssl/compat/apps_win.c
+++ b/apps/openssl/apps_win.c
@@ -10,7 +10,7 @@
10#include <io.h> 10#include <io.h>
11#include <fcntl.h> 11#include <fcntl.h>
12 12
13#include <apps.h> 13#include "apps.h"
14 14
15double 15double
16app_tminterval(int stop, int usertime) 16app_tminterval(int stop, int usertime)
diff --git a/apps/openssl/compat/certhash_win.c b/apps/openssl/certhash_win.c
index be57e2a..be57e2a 100644
--- a/apps/openssl/compat/certhash_win.c
+++ b/apps/openssl/certhash_win.c