Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(715)

Unified Diff: third_party/brotli/dec/port.h

Issue 1915823002: Update brotli from 722f89 (Feb 19, 2016) to 510131 (Apr 22, 2016) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/brotli/dec/huffman.c ('k') | third_party/brotli/dec/state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/brotli/dec/port.h
diff --git a/third_party/brotli/dec/port.h b/third_party/brotli/dec/port.h
index 6cbe49854138e3ef95af08f02e74b2619ea900e2..30b5cac742d67b8bee6ac565290197f371206160 100644
--- a/third_party/brotli/dec/port.h
+++ b/third_party/brotli/dec/port.h
@@ -18,13 +18,16 @@
read and overlapping memcpy; this reduces decompression speed by 5%
* BROTLI_DEBUG dumps file name and line number when decoder detects stream
or memory error
- * BROTLI_DECODE_DEBUG enables asserts and dumps various state information
+ * BROTLI_ENABLE_LOG enables asserts and dumps various state information
*/
#ifndef BROTLI_DEC_PORT_H_
#define BROTLI_DEC_PORT_H_
+#if defined(BROTLI_ENABLE_LOG) || defined(BROTLI_DEBUG)
#include <assert.h>
+#include <stdio.h>
+#endif
/* Compatibility with non-clang compilers. */
#ifndef __has_builtin
@@ -84,12 +87,13 @@
#endif
#ifdef BROTLI_BUILD_PORTABLE
-#define BROTLI_ALIGNED_READ 1
+#define BROTLI_ALIGNED_READ (!!1)
#elif defined(BROTLI_TARGET_X86) || defined(BROTLI_TARGET_X64) || \
defined(BROTLI_TARGET_ARMV7) || defined(BROTLI_TARGET_ARMV8)
-#define BROTLI_ALIGNED_READ 0 /* Allow unaligned access on whitelisted CPUs. */
+/* Allow unaligned read only for whitelisted CPUs. */
+#define BROTLI_ALIGNED_READ (!!0)
#else
-#define BROTLI_ALIGNED_READ 1
+#define BROTLI_ALIGNED_READ (!!1)
#endif
/* Define "PREDICT_TRUE" and "PREDICT_FALSE" macros for capable compilers.
@@ -119,9 +123,9 @@ OR:
/* IS_CONSTANT macros returns true for compile-time constant expressions. */
#if BROTLI_MODERN_COMPILER || __has_builtin(__builtin_constant_p)
-#define IS_CONSTANT(x) __builtin_constant_p(x)
+#define IS_CONSTANT(x) (!!__builtin_constant_p(x))
#else
-#define IS_CONSTANT(x) 0
+#define IS_CONSTANT(x) (!!0)
#endif
#if BROTLI_MODERN_COMPILER || __has_attribute(always_inline)
@@ -130,6 +134,16 @@ OR:
#define ATTRIBUTE_ALWAYS_INLINE
#endif
+#if BROTLI_MODERN_COMPILER || __has_attribute(visibility)
+#define ATTRIBUTE_VISIBILITY_HIDDEN __attribute__ ((visibility ("hidden")))
+#else
+#define ATTRIBUTE_VISIBILITY_HIDDEN
+#endif
+
+#ifndef BROTLI_INTERNAL
+#define BROTLI_INTERNAL ATTRIBUTE_VISIBILITY_HIDDEN
+#endif
+
#ifndef _MSC_VER
#if defined(__cplusplus) || !defined(__STRICT_ANSI__) || \
__STDC_VERSION__ >= 199901L
@@ -141,10 +155,22 @@ OR:
#define BROTLI_INLINE __forceinline
#endif /* _MSC_VER */
-#ifdef BROTLI_DECODE_DEBUG
+#ifdef BROTLI_ENABLE_LOG
#define BROTLI_DCHECK(x) assert(x)
+#define BROTLI_LOG(x) printf x
#else
#define BROTLI_DCHECK(x)
+#define BROTLI_LOG(x)
+#endif
+
+#if defined(BROTLI_DEBUG) || defined(BROTLI_ENABLE_LOG)
+static inline void BrotliDump(const char* f, int l, const char* fn) {
+ fprintf(stderr, "%s:%d (%s)\n", f, l, fn);
+ fflush(stderr);
+}
+#define BROTLI_DUMP() BrotliDump(__FILE__, __LINE__, __FUNCTION__)
+#else
+#define BROTLI_DUMP() (void)(0)
#endif
#if defined(BROTLI_BUILD_64_BIT)
@@ -207,9 +233,9 @@ static BROTLI_INLINE unsigned BrotliRBit(unsigned input) {
#endif /* gcc || clang */
#if defined(BROTLI_TARGET_ARM)
-#define BROTLI_HAS_UBFX 1
+#define BROTLI_HAS_UBFX (!!1)
#else
-#define BROTLI_HAS_UBFX 0
+#define BROTLI_HAS_UBFX (!!0)
#endif
#define BROTLI_ALLOC(S, L) S->alloc_func(S->memory_manager_opaque, L)
« no previous file with comments | « third_party/brotli/dec/huffman.c ('k') | third_party/brotli/dec/state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698