From 8fb030d900e7c9f0b1222e986bba076e84642a81 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Sun, 7 Jan 2007 19:50:16 +0000 Subject: fix GNUTLS compiling issue on recent MSVC versions by switching off Wincrypt.h, see: http://www.mail-archive.com/openssl-dev@openssl.org/msg03802.html for details svn path=/trunk/; revision=20336 --- config.nmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config.nmake') diff --git a/config.nmake b/config.nmake index c165a186bb..c5b2ec1c41 100644 --- a/config.nmake +++ b/config.nmake @@ -224,9 +224,7 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4 # isn't defined. # # Platform SDK conflicts with openssl.h header -!IFNDEF PLATFORM_SDK_DIR GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1 -!ENDIF # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -680,7 +678,8 @@ NETTLE_CONFIG= !IFDEF GNUTLS_DIR GNUTLS_PATH=$(GNUTLS_DIR) -GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include +# /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash +GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT GNUTLS_LIBS=\ $(GNUTLS_DIR)\bin\libtasn1-3.lib \ $(GNUTLS_DIR)\bin\libgpg-error-0.lib \ -- cgit v1.2.3