Fix the remaining warnings due to conflicting defines of ZLIB_INTERNAL

diff --git a/arch/x86/x86.h b/arch/x86/x86.h
index 0df08c2516cb785bd7e1ad633450379a47a75f13..78be0a661a13838958c266788c985f3767ca06d8 100644 (file)
--- 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 51435b36399a88b5598f236b6421348235081504..0921f176abfeef40d549b5f8d06ce24e5e376394 100644 (file)
--- 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