diff options
author | Matt Caswell <matt@openssl.org> | 2016-02-23 15:27:05 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-02-29 10:28:18 +0000 |
commit | b32166b4fabd2a3aeec382521b0173b24a5d7c02 (patch) | |
tree | 98884dd8d27a41e8bd4152b45c88b57c6573f6fb /util | |
parent | 0421c00e56cad9bdce5c1df4d406b7fc799bf6ad (diff) |
Workaround for VisualStudio 2015 bug
VisualStudio 2015 has a bug where an internal compiler error was occurring.
By reordering the DEFINE_STACK_OF declarations for SSL_CIPHER and SSL_COMP
until after the ssl3.h include everything seems ok again.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'util')
-rwxr-xr-x | util/mkdef.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index a11b008d0e..c7160036f0 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -641,7 +641,8 @@ sub do_defs next; } if ($tag{'TRUE'} != -1) { - if (/^\s*DECLARE_STACK_OF\s*\(\s*(\w*)\s*\)/) { + if (/^\s*DEFINE_STACK_OF\s*\(\s*(\w*)\s*\)/ + || /^\s*DEFINE_STACK_OF_CONST\s*\(\s*(\w*)\s*\)/) { next; } elsif (/^\s*DECLARE_ASN1_ENCODE_FUNCTIONS\s*\(\s*(\w*)\s*,\s*(\w*)\s*,\s*(\w*)\s*\)/) { $def .= "int d2i_$3(void);"; |