commit 944e580487ae86ca92dfb665a9eead0a854cf078
author Noel Gordon <noel@chromium.org> Tue Jan 30 01:23:09 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Tue Jan 30 01:23:09 2018 +0000
tree 87db753187feb30774ebbc3cab28c3a62b0e59de
parent 9bd7f694a4795c0e7f6e68232fd27dcee3507c5d

Remove feature guards from names.h

Having guards, per feature, is unneeded since BUILD.gn handles it
for us. Provided the new symbols of any feature code are added to
names.h, mangling their symbol names works, regardless of whether
we have guards in names.h or not. Remove the guards.

No change in behavior, no new tests.

Bug: 796178
Change-Id: I9441544f58c5db82ba0e42bf755872c4a0273e46
Reviewed-on: https://chromium-review.googlesource.com/891198
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#532716}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7f1e10802a20c5dbe737a2261bfcb78cb3baedcf

names.h

diff --git a/names.h b/names.h
index 6252b02..c58e6bc 100644
--- a/names.h
+++ b/names.h
@@ -162,23 +162,16 @@
 #define fill_window_sse Cr_z_fill_window_sse
 #define deflate_read_buf Cr_z_deflate_read_buf
 #define x86_check_features Cr_z_x86_check_features
-/* FIXME: x86_cpu_enable_ssse3 wasn't part of the simd.patch */
-#define x86_cpu_enable_ssse3 Cr_z_x86_cpu_enable_ssse3
 #define x86_cpu_enable_simd Cr_z_x86_cpu_enable_simd
 
-#if defined(ADLER32_SIMD_SSSE3) || defined(ADLER32_SIMD_NEON)
-/* Symbols added by adler_simd.c, see also the FIXME above */
+/* Symbols added by adler_simd.c */
 #define adler32_simd_ Cr_z_adler32_simd_
-#endif
+#define x86_cpu_enable_ssse3 Cr_z_x86_cpu_enable_ssse3
 
-#if defined(INFLATE_CHUNK_SIMD_SSE2) || defined(INFLATE_CHUNK_SIMD_NEON)
 /* Symbols added by contrib/optimizations/inffast_chunk */
 #define inflate_fast_chunk_ Cr_z_inflate_fast_chunk_
-#endif
 
-#if defined(CRC32_SIMD_SSE42_PCLMUL)
 /* Symbols added by crc32_simd.c */
 #define crc32_sse42_simd_ Cr_z_crc32_sse42_simd_
-#endif
 
 #endif  /* THIRD_PARTY_ZLIB_NAMES_H_ */