Fix an MSVC warning.
authorFdaSilvaYY <fdasilvayy@gmail.com>
Tue, 10 May 2016 20:20:23 +0000 (22:20 +0200)
committerRich Salz <rsalz@openssl.org>
Sat, 18 Jun 2016 20:30:24 +0000 (16:30 -0400)
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1168)

crypto/include/internal/cryptlib.h

index f2377d1c932db5691053b508049e99c3086e430b..05b8dc07f6af0db17df481e35b1a4e29b7f213f1 100644 (file)
@@ -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