From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 23 May 2020 03:19:02 +0000 (-0700)
Subject: Fixed compiler warning about inline already being defined when including zutil.h... 
X-Git-Tag: 1.9.9-b1~291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bdb74aa2d0e33e81d8638fca9c3273f15b3b7e2;p=thirdparty%2Fzlib-ng.git

Fixed compiler warning about inline already being defined when including zutil.h in C++ app.
---

diff --git a/zutil.h b/zutil.h
index 9da665273..457b47ca2 100644
--- a/zutil.h
+++ b/zutil.h
@@ -121,7 +121,7 @@ extern const char * const zng_errmsg[10]; /* indexed by 2-zlib_error */
 
 /* MS Visual Studio does not allow inline in C, only C++.
    But it provides __inline instead, so use that. */
-#if defined(_MSC_VER) && !defined(inline)
+#if defined(_MSC_VER) && !defined(inline) && !defined(__cplusplus) 
 #  define inline __inline
 #endif