Skip to content

Commit d829bf7

Browse files
committed
Remove more compound literal ifdefs (that I missed)
1 parent 7efbe1d commit d829bf7

File tree

3 files changed

+6
-20
lines changed

3 files changed

+6
-20
lines changed

src/bigint.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,13 +614,11 @@ ffc_internal ffc_inline
614614
bool ffc_bigint_pow5(ffc_bigint* me, uint32_t exp) {
615615
// multiply by a power of 5
616616
size_t large_length = sizeof(ffc_large_power_of_5) / sizeof(ffc_bigint_limb);
617-
#if _MSC_VER && !defined(__clang__)
617+
618618
ffc_bigint_limb_span large;
619619
large.ptr = (ffc_bigint_limb*)ffc_large_power_of_5;
620620
large.len = large_length;
621-
#else
622-
ffc_bigint_limb_span large = (ffc_bigint_limb_span){ .ptr = (ffc_bigint_limb*)ffc_large_power_of_5, .len = large_length};
623-
#endif
621+
624622
while (exp >= pow5_tables_large_step) {
625623
FFC_TRY(ffc_bigint_large_mul(&me->vec, large));
626624
exp -= pow5_tables_large_step;

src/common.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,13 @@ bool ffc_int_kind_is_signed(ffc_int_kind ik) {
8080

8181
ffc_internal ffc_inline
8282
ffc_value_bits ffc_get_value_bits(ffc_value value, ffc_value_kind vk) {
83+
ffc_value_bits bits;
8384
if (vk == FFC_VALUE_KIND_DOUBLE) {
84-
#if _MSC_VER && !defined(__clang__)
85-
ffc_value_bits bits;
8685
bits.di = ffc_get_double_bits(value.d);
87-
return bits;
88-
#else
89-
return (ffc_value_bits){.di=ffc_get_double_bits(value.d)};
90-
#endif
9186
} else {
92-
return (ffc_value_bits){.fi=ffc_get_float_bits(value.f)};
87+
bits.fi = ffc_get_float_bits(value.f);
9388
}
89+
return bits;
9490
}
9591

9692
ffc_internal ffc_inline

src/parse.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -509,14 +509,10 @@ ffc_result ffc_parse_int_string(
509509
}
510510

511511
if (p == pend || base < 2 || base > 36) {
512-
#if _MSC_VER && !defined(__clang__)
513512
ffc_result invalid_input_result;
514513
invalid_input_result.ptr = (char*)p;
515514
invalid_input_result.outcome = FFC_OUTCOME_INVALID_INPUT;
516515
return invalid_input_result;
517-
#else
518-
return (ffc_result){ .ptr = (char*)p, .outcome = FFC_OUTCOME_INVALID_INPUT };
519-
#endif
520516
}
521517

522518
ffc_result answer;
@@ -561,11 +557,7 @@ ffc_result ffc_parse_int_string(
561557

562558
if (digit_count == 0) {
563559
if (has_leading_zeros) {
564-
#if _MSC_VER && !defined(__clang__)
565-
value->u64 = 0;
566-
#else
567-
*value = (ffc_int_value){0}; // Largest variants are defined first so this will clear the entire union
568-
#endif
560+
value->u64 = 0; // Must zero the largest variant!
569561
answer.outcome = FFC_OUTCOME_OK;
570562
answer.ptr = p;
571563
} else {

0 commit comments

Comments
 (0)