Skip to content

Commit 2f9e0d3

Browse files
byrootmatzbot
authored andcommitted
[ruby/json] Fix duplicate 'inline' declaration specifier
Followup: ruby/json#889 ruby/json@591510392a
1 parent 4740b3d commit 2f9e0d3

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

ext/json/generator/generator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ static ALWAYS_INLINE() unsigned char sse2_next_match(search_state *search)
418418
#define TARGET_SSE2
419419
#endif
420420

421-
static inline TARGET_SSE2 ALWAYS_INLINE() unsigned char search_escape_basic_sse2(search_state *search)
421+
static TARGET_SSE2 ALWAYS_INLINE() unsigned char search_escape_basic_sse2(search_state *search)
422422
{
423423
if (RB_UNLIKELY(search->has_matches)) {
424424
// There are more matches if search->matches_mask > 0.

ext/json/simd/simd.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static inline uint8x16x4_t load_uint8x16_4(const unsigned char *table)
136136
#define _mm_cmpgt_epu8(a, b) _mm_xor_si128(_mm_cmple_epu8(a, b), _mm_set1_epi8(-1))
137137
#define _mm_cmplt_epu8(a, b) _mm_cmpgt_epu8(b, a)
138138

139-
static inline TARGET_SSE2 ALWAYS_INLINE() int compute_chunk_mask_sse2(const char *ptr)
139+
static TARGET_SSE2 ALWAYS_INLINE() int compute_chunk_mask_sse2(const char *ptr)
140140
{
141141
__m128i chunk = _mm_loadu_si128((__m128i const*)ptr);
142142
// Trick: c < 32 || c == 34 can be factored as c ^ 2 < 33
@@ -147,7 +147,7 @@ static inline TARGET_SSE2 ALWAYS_INLINE() int compute_chunk_mask_sse2(const char
147147
return _mm_movemask_epi8(needs_escape);
148148
}
149149

150-
static inline TARGET_SSE2 ALWAYS_INLINE() int string_scan_simd_sse2(const char **ptr, const char *end, int *mask)
150+
static TARGET_SSE2 ALWAYS_INLINE() int string_scan_simd_sse2(const char **ptr, const char *end, int *mask)
151151
{
152152
while (*ptr + sizeof(__m128i) <= end) {
153153
int chunk_mask = compute_chunk_mask_sse2(*ptr);

0 commit comments

Comments
 (0)