AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2024-11-25 04:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unprefixed macros from public headers (#662)

Browse Source
This commit is contained in:
Eugene Kliuchnikov 2018-04-20 14:10:55 +02:00 committed by GitHub
parent 68db5c0272
commit 6000396155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
c/common/platform.h
View File

@ -32,6 +32,18 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#if defined(__has_builtin)
#define BROTLI_HAS_BUILTIN(x) __has_builtin(x)
#else
#define BROTLI_HAS_BUILTIN(x) 0
#endif
#if defined(__has_attribute)
#define BROTLI_HAS_ATTRIBUTE(x) __has_attribute(x)
#else
#define BROTLI_HAS_ATTRIBUTE(x) 0
#endif
/* Macros for compiler / platform specific features and build options. /* Macros for compiler / platform specific features and build options.
Build options are: Build options are:
@ -48,7 +60,7 @@
* BROTLI_ENABLE_LOG enables asserts and dumps various state information * BROTLI_ENABLE_LOG enables asserts and dumps various state information
*/ */
#if BROTLI_MODERN_COMPILER || __has_attribute(always_inline) #if BROTLI_MODERN_COMPILER || BROTLI_HAS_ATTRIBUTE(always_inline)
#define BROTLI_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline)) #define BROTLI_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline))
#else #else
#define BROTLI_ATTRIBUTE_ALWAYS_INLINE #define BROTLI_ATTRIBUTE_ALWAYS_INLINE
@ -56,7 +68,7 @@
#if defined(_WIN32) || defined(__CYGWIN__) #if defined(_WIN32) || defined(__CYGWIN__)
#define BROTLI_ATTRIBUTE_VISIBILITY_HIDDEN #define BROTLI_ATTRIBUTE_VISIBILITY_HIDDEN
#elif BROTLI_MODERN_COMPILER || __has_attribute(visibility) #elif BROTLI_MODERN_COMPILER || BROTLI_HAS_ATTRIBUTE(visibility)
#define BROTLI_ATTRIBUTE_VISIBILITY_HIDDEN \ #define BROTLI_ATTRIBUTE_VISIBILITY_HIDDEN \
__attribute__ ((visibility ("hidden"))) __attribute__ ((visibility ("hidden")))
#else #else
@ -78,7 +90,7 @@
#define BROTLI_INLINE __forceinline #define BROTLI_INLINE __forceinline
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#if BROTLI_MODERN_COMPILER || __has_attribute(unused) #if BROTLI_MODERN_COMPILER || BROTLI_HAS_ATTRIBUTE(unused)
#define BROTLI_UNUSED_FUNCTION static BROTLI_INLINE __attribute__ ((unused)) #define BROTLI_UNUSED_FUNCTION static BROTLI_INLINE __attribute__ ((unused))
#else #else
#define BROTLI_UNUSED_FUNCTION static BROTLI_INLINE #define BROTLI_UNUSED_FUNCTION static BROTLI_INLINE
@ -93,7 +105,7 @@
#define BROTLI_RESTRICT #define BROTLI_RESTRICT
#endif #endif
#if BROTLI_MODERN_COMPILER || __has_attribute(noinline) #if BROTLI_MODERN_COMPILER || BROTLI_HAS_ATTRIBUTE(noinline)
#define BROTLI_NOINLINE __attribute__((noinline)) #define BROTLI_NOINLINE __attribute__((noinline))
#else #else
#define BROTLI_NOINLINE #define BROTLI_NOINLINE
@ -324,7 +336,7 @@ OR:
} }
*/ */
#if BROTLI_MODERN_COMPILER || __has_builtin(__builtin_expect) #if BROTLI_MODERN_COMPILER || BROTLI_HAS_BUILTIN(__builtin_expect)
#define BROTLI_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1)) #define BROTLI_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
#define BROTLI_PREDICT_FALSE(x) (__builtin_expect(x, 0)) #define BROTLI_PREDICT_FALSE(x) (__builtin_expect(x, 0))
#else #else
@ -333,7 +345,7 @@ OR:
#endif #endif
/* BROTLI_IS_CONSTANT macros returns true for compile-time constants. */ /* BROTLI_IS_CONSTANT macros returns true for compile-time constants. */
#if BROTLI_MODERN_COMPILER || __has_builtin(__builtin_constant_p) #if BROTLI_MODERN_COMPILER || BROTLI_HAS_BUILTIN(__builtin_constant_p)
#define BROTLI_IS_CONSTANT(x) (!!__builtin_constant_p(x)) #define BROTLI_IS_CONSTANT(x) (!!__builtin_constant_p(x))
#else #else
#define BROTLI_IS_CONSTANT(x) (!!0) #define BROTLI_IS_CONSTANT(x) (!!0)

3
c/enc/fast_log.h
View File

@ -19,7 +19,8 @@ extern "C" {
#endif #endif
static BROTLI_INLINE uint32_t Log2FloorNonZero(size_t n) { static BROTLI_INLINE uint32_t Log2FloorNonZero(size_t n) {
#if BROTLI_MODERN_COMPILER || __has_builtin(__builtin_clz) /* TODO: generalize and move to platform.h */
#if BROTLI_MODERN_COMPILER || BROTLI_HAS_BUILTIN(__builtin_clz)
return 31u ^ (uint32_t)__builtin_clz((uint32_t)n); return 31u ^ (uint32_t)__builtin_clz((uint32_t)n);
#else #else
uint32_t result = 0; uint32_t result = 0;

19
c/include/brotli/port.h
View File

@ -14,19 +14,6 @@
#ifndef BROTLI_COMMON_PORT_H_ #ifndef BROTLI_COMMON_PORT_H_
#define BROTLI_COMMON_PORT_H_ #define BROTLI_COMMON_PORT_H_
/* Compatibility with non-clang compilers. */
#ifndef __has_builtin
#define __has_builtin(x) 0
#endif
#ifndef __has_attribute
#define __has_attribute(x) 0
#endif
#ifndef __has_feature
#define __has_feature(x) 0
#endif
#if defined(__GNUC__) && defined(__GNUC_MINOR__) #if defined(__GNUC__) && defined(__GNUC_MINOR__)
#define BROTLI_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #define BROTLI_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#else #else
@ -69,10 +56,4 @@
#define BROTLI_ENC_API #define BROTLI_ENC_API
#endif #endif
#if BROTLI_MODERN_COMPILER || __has_attribute(deprecated)
#define BROTLI_DEPRECATED __attribute__((deprecated))
#else
#define BROTLI_DEPRECATED
#endif
#endif /* BROTLI_COMMON_PORT_H_ */ #endif /* BROTLI_COMMON_PORT_H_ */

1
java/org/brotli/dec/State.java
View File

@ -66,7 +66,6 @@ final class State {
int maxBackwardDistance; int maxBackwardDistance;
int maxRingBufferSize; int maxRingBufferSize;
int ringBufferSize; int ringBufferSize;
int ringBufferFence;
int expectedTotalSize; int expectedTotalSize;
int outputOffset; int outputOffset;
int outputLength; int outputLength;