From dca125efb54b025e7bd2050587a488ebe5409205 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Thu, 23 Jun 2016 17:52:47 -0400 Subject: [PATCH] Remove compatibility 'inline' define. MSVC 2015 seems to support it just fine. Change-Id: I9c91c18c260031e6024480d1f57bbb334ed7118c Reviewed-on: https://boringssl-review.googlesource.com/8501 Reviewed-by: Adam Langley --- crypto/internal.h | 4 ---- ssl/d1_both.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/crypto/internal.h b/crypto/internal.h index e35fb7bd..05fa5693 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -141,10 +141,6 @@ extern "C" { void OPENSSL_cpuid_setup(void); #endif -#if !defined(inline) -#define inline __inline -#endif - #if !defined(_MSC_VER) && defined(OPENSSL_64_BIT) typedef __int128_t int128_t; diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 690a29f1..e23d2949 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -186,13 +186,9 @@ err: return NULL; } -#if !defined(inline) -#define inline __inline -#endif - /* bit_range returns a |uint8_t| with bits |start|, inclusive, to |end|, * exclusive, set. */ -static inline uint8_t bit_range(size_t start, size_t end) { +static uint8_t bit_range(size_t start, size_t end) { return (uint8_t)(~((1u << start) - 1) & ((1u << end) - 1)); }