diff options
author | Andy Polyakov <appro@openssl.org> | 2016-06-26 13:40:15 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2016-07-08 11:49:44 +0200 |
commit | f1f5ee17b64397eecfde39960ca11e94064297bd (patch) | |
tree | 811a0a155a461065aecca798e7b7e090de7b80d9 /util | |
parent | ab6a591caa561017f881ed36028177f9582a74c6 (diff) |
include/openssl: don't include <windows.h> in public headers.
If application uses any of Windows-specific interfaces, make it
application developer's respondibility to include <windows.h>.
Rationale is that <windows.h> is quite "toxic" and is sensitive
to inclusion order (most notably in relation to <winsock2.h>).
It's only natural to give complete control to the application developer.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@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 c2fbfe7062..fa37ccb3e0 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -73,7 +73,7 @@ my $linux=0; my $safe_stack_def = 0; my @known_platforms = ( "__FreeBSD__", "PERL5", - "EXPORT_VAR_AS_FUNCTION", "ZLIB" + "EXPORT_VAR_AS_FUNCTION", "ZLIB", "_WIN32" ); my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" ); my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", @@ -1121,6 +1121,7 @@ sub is_valid if ($keyword eq "VMSNonVAX" && $VMSNonVAX) { return 1; } if ($keyword eq "VMS" && $VMS) { return 1; } if ($keyword eq "WIN32" && $W32) { return 1; } + if ($keyword eq "_WIN32" && $W32) { return 1; } if ($keyword eq "WINNT" && $NT) { return 1; } # Special platforms: # EXPORT_VAR_AS_FUNCTION means that global variables |