Skip to content

Commit a0ea884

Browse files
committed
Merge pull request bitcoin#200
bf2e1ac Convert tests to C89. (also fixes a use of bare "inline" in field) (Gregory Maxwell)
2 parents fc8285f + bf2e1ac commit a0ea884

File tree

2 files changed

+234
-167
lines changed

2 files changed

+234
-167
lines changed

src/field_10x26_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ static void secp256k1_fe_sqr(secp256k1_fe_t *r, const secp256k1_fe_t *a) {
10631063
#endif
10641064
}
10651065

1066-
static inline void secp256k1_fe_storage_cmov(secp256k1_fe_storage_t *r, const secp256k1_fe_storage_t *a, int flag) {
1066+
static SECP256K1_INLINE void secp256k1_fe_storage_cmov(secp256k1_fe_storage_t *r, const secp256k1_fe_storage_t *a, int flag) {
10671067
uint32_t mask0 = flag + ~((uint32_t)0), mask1 = ~mask0;
10681068
r->n[0] = (r->n[0] & mask0) | (a->n[0] & mask1);
10691069
r->n[1] = (r->n[1] & mask0) | (a->n[1] & mask1);
@@ -1089,7 +1089,7 @@ static void secp256k1_fe_to_storage(secp256k1_fe_storage_t *r, const secp256k1_f
10891089
r->n[7] = a->n[8] >> 16 | a->n[9] << 10;
10901090
}
10911091

1092-
static inline void secp256k1_fe_from_storage(secp256k1_fe_t *r, const secp256k1_fe_storage_t *a) {
1092+
static SECP256K1_INLINE void secp256k1_fe_from_storage(secp256k1_fe_t *r, const secp256k1_fe_storage_t *a) {
10931093
r->n[0] = a->n[0] & 0x3FFFFFFUL;
10941094
r->n[1] = a->n[0] >> 26 | ((a->n[1] << 6) & 0x3FFFFFFUL);
10951095
r->n[2] = a->n[1] >> 20 | ((a->n[2] << 12) & 0x3FFFFFFUL);

0 commit comments

Comments
 (0)