diff options
| author | Matt Caswell <matt@openssl.org> | 2017-11-16 17:07:21 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-02-20 12:59:29 +0000 |
| commit | aacf29b8aabf549817cf2328ef22a5638ee4d738 (patch) | |
| tree | e3685b6541f126b376af60c1a27483a5f0ae8b5b /crypto/ec/curve448/curve448utils.h | |
| parent | 88ba7e71e0aff19b3a8a5e37758dcf88e8bae848 (diff) | |
Replace DECAF_INLINE with ossl_inline
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5105)
Diffstat (limited to 'crypto/ec/curve448/curve448utils.h')
| -rw-r--r-- | crypto/ec/curve448/curve448utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h index 1ef3d73672..7997cfd6f4 100644 --- a/crypto/ec/curve448/curve448utils.h +++ b/crypto/ec/curve448/curve448utils.h @@ -14,6 +14,7 @@ #include <stdint.h> #include <sys/types.h> +#include <openssl/e_os2.h> #ifdef __cplusplus extern "C" { @@ -28,7 +29,6 @@ extern "C" { #define DECAF_NOINLINE __attribute__((noinline)) #define DECAF_WARN_UNUSED __attribute__((warn_unused_result)) #define DECAF_NONNULL __attribute__((nonnull)) -#define DECAF_INLINE inline __attribute__((always_inline,unused)) /** @endcond */ /* Internal word types. @@ -76,13 +76,13 @@ typedef enum { /** Return success if x is true */ -static DECAF_INLINE decaf_error_t +static ossl_inline decaf_error_t decaf_succeed_if(decaf_bool_t x) { return (decaf_error_t)x; } /** Return DECAF_TRUE iff x == DECAF_SUCCESS */ -static DECAF_INLINE decaf_bool_t +static ossl_inline decaf_bool_t decaf_successful(decaf_error_t e) { decaf_dword_t w = ((decaf_word_t)e) ^ ((decaf_word_t)DECAF_SUCCESS); return (w-1)>>DECAF_WORD_BITS; |