From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Thu, 28 Apr 2016 12:06:46 +0000 (+0200)
Subject: Fix the remaining warnings due to conflicting defines of ZLIB_INTERNAL
X-Git-Tag: 1.9.9-b1~777
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=616a60367fc03b474700fb028b9037dca45c360a;p=thirdparty%2Fzlib-ng.git

Fix the remaining warnings due to conflicting defines of ZLIB_INTERNAL
---

diff --git a/arch/x86/x86.h b/arch/x86/x86.h
index 0df08c251..78be0a661 100644
--- a/arch/x86/x86.h
+++ b/arch/x86/x86.h
@@ -6,7 +6,9 @@
 #ifndef CPU_H_
 #define CPU_H_
 
-#ifdef HAVE_HIDDEN
+#if defined(HAVE_INTERNAL)
+#  define ZLIB_INTERNAL __attribute__((visibility ("internal")))
+#elif defined(HAVE_HIDDEN)
 # define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 # define ZLIB_INTERNAL
diff --git a/gzguts.h b/gzguts.h
index 51435b363..0921f176a 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -14,7 +14,9 @@
 #  endif
 #endif
 
-#ifdef HAVE_HIDDEN
+#if defined(HAVE_INTERNAL)
+#  define ZLIB_INTERNAL __attribute__((visibility ("internal")))
+#elif defined(HAVE_HIDDEN)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL