Rename #defines for consistency (madler#378)

Author: nmoinvaz

CMakeLists.txt

@@ -326,7 +326,7 @@ check_c_source_compiles(
     }"
     HAVE_ATTRIBUTE_VISIBILITY_HIDDEN FAIL_REGEX "not supported")
 if(HAVE_ATTRIBUTE_VISIBILITY_HIDDEN)
-    add_definitions(-DHAVE_HIDDEN)
+    add_definitions(-DHAVE_VISIBILITY_HIDDEN)
 endif()
 
 #
@@ -341,7 +341,7 @@ check_c_source_compiles(
     }"
     HAVE_ATTRIBUTE_VISIBILITY_INTERNAL FAIL_REGEX "not supported")
 if(HAVE_ATTRIBUTE_VISIBILITY_INTERNAL)
-    add_definitions(-DHAVE_INTERNAL)
+    add_definitions(-DHAVE_VISIBILITY_INTERNAL)
 endif()
 
 #
@@ -579,17 +579,17 @@ if(WITH_OPTIM)
         add_definitions("-DX86_CPUID")
         set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/x86.c)
         if(HAVE_SSE42CRC_INLINE_ASM OR HAVE_SSE42CRC_INTRIN)
-            add_definitions(-DX86_SSE4_2_CRC_HASH)
+            add_definitions(-DX86_SSE42_CRC_HASH)
             set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/insert_string_sse.c)
-            add_feature_info(SSE4_CRC 1 "Support CRC hash generation using the SSE4.2 instruction set, using \"${SSE4FLAG}\"")
+            add_feature_info(SSE42_CRC 1 "Support CRC hash generation using the SSE4.2 instruction set, using \"${SSE4FLAG}\"")
             add_intrinsics_option("${SSE4FLAG}")
             if(HAVE_SSE42CRC_INTRIN)
-                add_definitions(-DX86_SSE4_2_CRC_INTRIN)
+                add_definitions(-DX86_SSE42_CRC_INTRIN)
             endif()
             if(WITH_NEW_STRATEGIES)
                 add_definitions(-DX86_QUICK_STRATEGY)
                 set(ZLIB_ARCH_SRCS ${ZLIB_ARCH_SRCS} ${ARCHDIR}/deflate_quick.c)
-                add_feature_info(SSE4DEFLATE 1 "Support SSE4.2-accelerated quick compression")
+                add_feature_info(SSE42_DEFLATE_QUICK 1 "Support SSE4.2-accelerated quick compression")
             endif()
         endif()
         if(HAVE_SSE2_INTRIN)

arch/x86/insert_string_sse.c

@@ -16,7 +16,7 @@
  *    input characters and the first MIN_MATCH bytes of str are valid
  *    (except for the last MIN_MATCH-1 bytes of the input file).
  */
-#ifdef X86_SSE4_2_CRC_HASH
+#ifdef X86_SSE42_CRC_HASH
 ZLIB_INTERNAL Pos insert_string_sse(deflate_state *const s, const Pos str, unsigned int count) {
     Pos ret = 0;
     unsigned int idx;
@@ -30,7 +30,7 @@ ZLIB_INTERNAL Pos insert_string_sse(deflate_state *const s, const Pos str, unsig
         if (s->level >= TRIGGER_LEVEL)
             val &= 0xFFFFFF;
 
-#if defined(X86_SSE4_2_CRC_INTRIN)
+#if defined(X86_SSE42_CRC_INTRIN)
 #  ifdef _MSC_VER
         h = _mm_crc32_u32(h, val);
 #  else

configure

@@ -822,8 +822,8 @@ int ZLIB_INTERNAL foo;
 int main() { return 0; }
 EOF
   if tryboth $CC -c $CFLAGS $test.c; then
-    CFLAGS="$CFLAGS -DHAVE_HIDDEN"
-    SFLAGS="$SFLAGS -DHAVE_HIDDEN"
+    CFLAGS="$CFLAGS -DHAVE_VISIBILITY_HIDDEN"
+    SFLAGS="$SFLAGS -DHAVE_VISIBILITY_HIDDEN"
     echo >> configure.log
     echo "Checking for attribute(visibility(hidden)) support... Yes." | tee -a configure.log
   else
@@ -841,8 +841,8 @@ int ZLIB_INTERNAL foo;
 int main() { return 0; }
 EOF
   if tryboth $CC -c $CFLAGS $test.c; then
-    CFLAGS="$CFLAGS -DHAVE_INTERNAL"
-    SFLAGS="$SFLAGS -DHAVE_INTERNAL"
+    CFLAGS="$CFLAGS -DHAVE_VISIBILITY_INTERNAL"
+    SFLAGS="$SFLAGS -DHAVE_VISIBILITY_INTERNAL"
     echo >> configure.log
     echo "Checking for attribute(visibility(internal)) support... Yes." | tee -a configure.log
   else
@@ -1014,12 +1014,12 @@ case "${ARCH}" in
             fi
 
             if test ${HAVE_SSE42CRC_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSE4_2_CRC_INTRIN"
-                SFLAGS="${SFLAGS} -DX86_SSE4_2_CRC_INTRIN"
+                CFLAGS="${CFLAGS} -DX86_SSE42_CRC_INTRIN"
+                SFLAGS="${SFLAGS} -DX86_SSE42_CRC_INTRIN"
             fi
 
-            CFLAGS="${CFLAGS} -DX86_SSE4_2_CRC_HASH"
-            SFLAGS="${SFLAGS} -DX86_SSE4_2_CRC_HASH"
+            CFLAGS="${CFLAGS} -DX86_SSE42_CRC_HASH"
+            SFLAGS="${SFLAGS} -DX86_SSE42_CRC_HASH"
             ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} insert_string_sse.o"
             ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} insert_string_sse.lo"
 
@@ -1042,15 +1042,15 @@ case "${ARCH}" in
 
         # Enable arch-specific optimizations?
         if test $without_optimizations -eq 0; then
-            CFLAGS="${CFLAGS} -DX86_CPUID -DX86_SSE2 -DX86_SSE4_2_CRC_HASH"
-            SFLAGS="${SFLAGS} -DX86_CPUID -DX86_SSE2 -DX86_SSE4_2_CRC_HASH"
+            CFLAGS="${CFLAGS} -DX86_CPUID -DX86_SSE2 -DX86_SSE42_CRC_HASH"
+            SFLAGS="${SFLAGS} -DX86_CPUID -DX86_SSE2 -DX86_SSE42_CRC_HASH"
 
             ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} x86.o fill_window_sse.o insert_string_sse.o"
             ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} x86.lo fill_window_sse.lo insert_string_sse.lo"
 
             if test ${HAVE_SSE42CRC_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSE4_2_CRC_INTRIN"
-                SFLAGS="${SFLAGS} -DX86_SSE4_2_CRC_INTRIN"
+                CFLAGS="${CFLAGS} -DX86_SSE42_CRC_INTRIN"
+                SFLAGS="${SFLAGS} -DX86_SSE42_CRC_INTRIN"
             fi
 
             if test ${HAVE_PCLMULQDQ_INTRIN} -eq 1; then

deflate.c

@@ -325,7 +325,7 @@ int ZEXPORT PREFIX(deflateInit2_)(PREFIX3(stream) *strm, int level, int method,
     s->w_size = 1 << s->w_bits;
     s->w_mask = s->w_size - 1;
 
-#ifdef X86_SSE4_2_CRC_HASH
+#ifdef X86_SSE42_CRC_HASH
     if (x86_cpu_has_sse42)
         s->hash_bits = (unsigned int)15;
     else

functable.c

@@ -10,7 +10,7 @@
 
 #include "functable.h"
 /* insert_string */
-#ifdef X86_SSE4_2_CRC_HASH
+#ifdef X86_SSE42_CRC_HASH
 extern Pos insert_string_sse(deflate_state *const s, const Pos str, unsigned int count);
 #elif defined(ARM_ACLE_CRC_HASH)
 extern Pos insert_string_acle(deflate_state *const s, const Pos str, unsigned int count);
@@ -61,7 +61,7 @@ ZLIB_INTERNAL Pos insert_string_stub(deflate_state *const s, const Pos str, unsi
     // Initialize default
     functable.insert_string=&insert_string_c;
 
-    #ifdef X86_SSE4_2_CRC_HASH
+    #ifdef X86_SSE42_CRC_HASH
     if (x86_cpu_has_sse42)
         functable.insert_string=&insert_string_sse;
     #elif defined(__ARM_FEATURE_CRC32) && defined(ARM_ACLE_CRC_HASH)

gzguts.h

@@ -14,9 +14,9 @@
 #  endif
 #endif
 
-#if defined(HAVE_INTERNAL)
+#if defined(HAVE_VISIBILITY_INTERNAL)
 #  define ZLIB_INTERNAL __attribute__((visibility ("internal")))
-#elif defined(HAVE_HIDDEN)
+#elif defined(HAVE_VISIBILITY_HIDDEN)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL

win32/Makefile.msc

@@ -23,7 +23,7 @@ AR = lib
 RC = rc
 CP = copy /y
 CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DX86_PCLMULQDQ_CRC -DX86_SSE2 -DX86_CPUID -DX86_SSE4_2_CRC_HASH -DUNALIGNED_OK -DX86_QUICK_STRATEGY
+WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DX86_PCLMULQDQ_CRC -DX86_SSE2 -DX86_CPUID -DX86_SSE42_CRC_HASH -DUNALIGNED_OK -DX86_QUICK_STRATEGY
 LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest
 ARFLAGS = -nologo
 RCFLAGS = /dWIN32 /r

zutil.h

@@ -12,9 +12,9 @@
 
 /* @(#) $Id$ */
 
-#if defined(HAVE_INTERNAL)
+#if defined(HAVE_VISIBILITY_INTERNAL)
 #  define ZLIB_INTERNAL __attribute__((visibility ("internal")))
-#elif defined(HAVE_HIDDEN)
+#elif defined(HAVE_VISIBILITY_HIDDEN)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL