diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-05-10 22:20:23 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-06-18 16:30:24 -0400 |
| commit | b1b1cba4e2ae76bc3b8390842c8482dc0b3358ca (patch) | |
| tree | daa2545350c5398c4b649e5506eb27b9a85fa031 /crypto/include | |
| parent | 1dcb8ca2a4aa71964105b24fa7c6254a58b7ad35 (diff) | |
| download | openssl-b1b1cba4e2ae76bc3b8390842c8482dc0b3358ca.tar.gz | |
Fix an MSVC warning.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1168)
Diffstat (limited to 'crypto/include')
| -rw-r--r-- | crypto/include/internal/cryptlib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/include/internal/cryptlib.h b/crypto/include/internal/cryptlib.h index f2377d1c93..05b8dc07f6 100644 --- a/crypto/include/internal/cryptlib.h +++ b/crypto/include/internal/cryptlib.h @@ -16,6 +16,7 @@ # include "e_os.h" # ifdef OPENSSL_USE_APPLINK +# undef BIO_FLAGS_UPLINK # define BIO_FLAGS_UPLINK 0x8000 # include "ms/uplink.h" # endif |