From: Deniz Bahadir <deniz@code.bahadir.email>
Date: Thu, 23 Dec 2021 00:13:03 +0000 (+0100)
Subject: Fix compilation with clang-cl on windows
X-Git-Tag: 2.1.0-beta1~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=498fac54e81b173d7b5bbc53f2f6c5716203a271;p=thirdparty%2Fzlib-ng.git

Fix compilation with clang-cl on windows

Do not include (system) headers when processing these headers with the
resource compiler, because it might trip over the headers coming from
LLVM.
---

diff --git a/zlib-ng.h.in b/zlib-ng.h.in
index 30deabf1d..9274f75e6 100644
--- a/zlib-ng.h.in
+++ b/zlib-ng.h.in
@@ -33,6 +33,7 @@
 #  error Include zlib-ng.h for zlib-ng API or zlib.h for zlib-compat API but not both
 #endif
 
+#ifndef RC_INVOKED
 #include "zconf-ng.h"
 
 #include <stdint.h>
@@ -40,6 +41,7 @@
 #ifndef ZCONFNG_H
 #  error Missing zconf-ng.h add binary output directory to include directories
 #endif
+#endif  /* RC_INVOKED */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/zlib.h.in b/zlib.h.in
index 1c2944cef..d170e25c9 100644
--- a/zlib.h.in
+++ b/zlib.h.in
@@ -34,6 +34,7 @@
 #  error Include zlib-ng.h for zlib-ng API or zlib.h for zlib-compat API but not both
 #endif
 
+#ifndef RC_INVOKED
 #include "zconf.h"
 
 #include <stdint.h>
@@ -42,6 +43,7 @@
 #ifndef ZCONF_H
 #  error Missing zconf.h add binary output directory to include directories
 #endif
+#endif  /* RC_INVOKED */
 
 #ifdef __cplusplus
 extern "C" {