diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2016-06-14 18:32:27 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2016-06-14 18:32:27 +0000 |
| commit | b89b38ae13e500afa335ac87598f3a3a82f3b364 (patch) | |
| tree | 950cc910bb3b4aa4132579bf308978b5a998881f /support/ab.c | |
| parent | f2c1f268b06a7a7985051ead4094044c90603c59 (diff) | |
| download | httpd-b89b38ae13e500afa335ac87598f3a3a82f3b364.tar.gz | |
Prepare to backport, this is not specific to VS 2015...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1748448 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/ab.c')
| -rw-r--r-- | support/ab.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/support/ab.c b/support/ab.c index eafc707644..a426dadb84 100644 --- a/support/ab.c +++ b/support/ab.c @@ -170,7 +170,11 @@ #define SK_VALUE(x,y) sk_X509_value(x,y) typedef STACK_OF(X509) X509_STACK_TYPE; -#if defined(_MSC_VER) && _MSC_VER >= 1900 +#if defined(_MSC_VER) +/* The following logic ensures we correctly glue FILE* within one CRT used + * by the OpenSSL library build to another CRT used by the ab.exe build. + * This became especially problematic with Visual Studio 2015. + */ #include <openssl/applink.c> #endif |