Replace DECAF_INLINE with ossl_inline

[openssl.git] / crypto / ec / curve448 / word.h

diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h
index 22ffe8dd0795e3bdf4b9dc23f534713779a32035..39ea949861d1ddc2982c48b83b7fa2f0371995fa 100644 (file)
--- a/crypto/ec/curve448/word.h
+++ b/crypto/ec/curve448/word.h
@@ -96,7 +96,7 @@
     typedef uint64x4_t uint64xn_t;
     typedef uint32x8_t uint32xn_t;
 
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_set_to_mask(mask_t x) {
         uint32_t y = (uint32_t)x;
         big_register_t ret = {y,y,y,y,y,y,y,y};
@@ -108,7 +108,7 @@
     typedef uint64x2_t uint64xn_t;
     typedef uint32x4_t uint32xn_t;
 
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_set_to_mask(mask_t x) {
         uint32_t y = x;
         big_register_t ret = {y,y,y,y};
@@ -120,7 +120,7 @@
     typedef uint64x2_t uint64xn_t;
     typedef uint32x4_t uint32xn_t;
     
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_set_to_mask(mask_t x) {
         return vdupq_n_u32(x);
     }
@@ -129,7 +129,7 @@
     typedef uint64_t big_register_t, uint64xn_t;
 
     typedef uint32_t uint32xn_t;
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_set_to_mask(mask_t x) {
         return (big_register_t)x;
     }
@@ -139,25 +139,25 @@
     typedef uint32_t uint32xn_t;
     typedef uint32_t big_register_t;
 
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_set_to_mask(mask_t x) {
         return (big_register_t)x;
     }
 #endif
 
 #if __AVX2__
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_is_zero(big_register_t x) {
         return (big_register_t)(x == br_set_to_mask(0));
     }
 #elif __SSE2__
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_is_zero(big_register_t x) {
         return (big_register_t)_mm_cmpeq_epi32((__m128i)x, _mm_setzero_si128());
         //return (big_register_t)(x == br_set_to_mask(0));
     }
 #elif __ARM_NEON__
-    static DECAF_INLINE big_register_t
+    static ossl_inline big_register_t
     br_is_zero(big_register_t x) {
         return vceqq_u32(x,x^x);
     }
@@ -189,11 +189,11 @@
  * On the third hand, we have success vs boolean types, but that's handled in
  * common.h: it converts between decaf_bool_t and decaf_error_t.
  */
-static DECAF_INLINE decaf_bool_t mask_to_bool (mask_t m) {
+static ossl_inline decaf_bool_t mask_to_bool (mask_t m) {
     return (decaf_sword_t)(sword_t)m;
 }
 
-static DECAF_INLINE mask_t bool_to_mask (decaf_bool_t m) {
+static ossl_inline mask_t bool_to_mask (decaf_bool_t m) {
     /* On most arches this will be optimized to a simple cast. */
     mask_t ret = 0;
     unsigned int limit = sizeof(decaf_bool_t)/sizeof(mask_t);
@@ -204,7 +204,7 @@ static DECAF_INLINE mask_t bool_to_mask (decaf_bool_t m) {
     return ret;
 }
 
-static DECAF_INLINE void ignore_result ( decaf_bool_t boo ) {
+static ossl_inline void ignore_result ( decaf_bool_t boo ) {
     (void)boo;
 }