[GNUnet-SVN] [gnurl] 67/208: winbuild: fix boringssl build

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit cd34ffa614b04ed6ab6533fa3b8661f0ef9abfa9
Author: Henrik S. Gaßmann <address@hidden>
AuthorDate: Sat Jun 24 11:55:21 2017 +0200

    winbuild: fix boringssl build
    
    Compile with `WIN32_LEAN_AND_MEAN` which prevents `windows.h` from
    including too much clutter including `wincrypt.h` which in turn contains
    some preprocessor macros that clash with boringssl symbols.
    
    Detect boringssl by checking the existance of `is_boringssl.h` and set
    the corresponding `HAVE_BORINGSSL` for compilation which is used in
    `ldap.c` to undefine the evil macros.
    
    Closes #1610
---
 winbuild/MakefileBuild.vc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 83f92374e..eb28efefd 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -60,7 +60,7 @@ CFLAGS     = /I. /I../lib /I../include /nologo /W3 /GX 
/DWIN32 /YX /FD /c /DBUIL
 !ELSE
 CC_NODEBUG  = $(CC) /O2 /DNDEBUG
 CC_DEBUG    = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd /W3
-CFLAGS      = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c 
/DBUILDING_LIBCURL
+CFLAGS      = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c 
/DBUILDING_LIBCURL /DWIN32_LEAN_AND_MEAN
 !ENDIF
 
 LFLAGS     = /nologo /machine:$(MACHINE)
@@ -133,6 +133,9 @@ SSL          = static
 
 !IFDEF USE_SSL
 SSL_CFLAGS   = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl"
+!IF EXISTS("$(DEVEL_INCLUDE)\openssl\is_boringssl.h")
+SSL_CFLAGS   = $(SSL_CFLAGS) /DHAVE_BORINGSSL
+!ENDIF
 !ENDIF
 
 !IF "$(WITH_NGHTTP2)"=="dll"

-- 
To stop receiving notification emails like this one, please contact
address@hidden