kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove compatibility 'inline' define.

Browse Source 
MSVC 2015 seems to support it just fine.

Change-Id: I9c91c18c260031e6024480d1f57bbb334ed7118c
Reviewed-on: https://boringssl-review.googlesource.com/8501
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-06-23 17:52:47 -04:00 committed by Adam Langley
parent aad50db45d
commit dca125efb5
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/internal.h
View File

@ -141,10 +141,6 @@ extern "C" {
void OPENSSL_cpuid_setup(void); void OPENSSL_cpuid_setup(void);
#endif #endif
#if !defined(inline)
#define inline __inline
#endif
#if !defined(_MSC_VER) && defined(OPENSSL_64_BIT) #if !defined(_MSC_VER) && defined(OPENSSL_64_BIT)
typedef __int128_t int128_t; typedef __int128_t int128_t;

6
ssl/d1_both.c
View File

@ -186,13 +186,9 @@ err:
return NULL; return NULL;
} }
#if !defined(inline)
#define inline __inline
#endif
/* bit_range returns a |uint8_t| with bits |start|, inclusive, to |end|, /* bit_range returns a |uint8_t| with bits |start|, inclusive, to |end|,
* exclusive, set. */ * 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)); return (uint8_t)(~((1u << start) - 1) & ((1u << end) - 1));
} }