Skip to content

Commit c4782c4

Browse files
committed
Fix meson detection of a couple of 64 bit builtins.
A couple of checks were missed by commit 962da90, so we would fail to detect the features. Reported-by: Юрий Соколов <y.sokolov@postgrespro.ru> Discussion: https://postgr.es/m/42C25E2A-6519-4549-9F47-6B0686E83836%40postgrespro.ru
1 parent 5b291d1 commit c4782c4

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

meson.build

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2101,7 +2101,7 @@ __sync_val_compare_and_swap(&val, 0, 37);'''},
21012101
{'name': 'HAVE_GCC__SYNC_INT64_CAS',
21022102
'desc': '__sync_val_compare_and_swap(int64)',
21032103
'test': '''
2104-
INT64 val = 0;
2104+
int64_t val = 0;
21052105
__sync_val_compare_and_swap(&val, 0, 37);'''},
21062106

21072107
{'name': 'HAVE_GCC__ATOMIC_INT32_CAS',
@@ -2114,13 +2114,14 @@ __atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_REL
21142114
{'name': 'HAVE_GCC__ATOMIC_INT64_CAS',
21152115
'desc': ' __atomic_compare_exchange_n(int64)',
21162116
'test': '''
2117-
INT64 val = 0;
2118-
INT64 expect = 0;
2117+
int64_t val = 0;
2118+
int64_t expect = 0;
21192119
__atomic_compare_exchange_n(&val, &expect, 37, 0, __ATOMIC_SEQ_CST, __ATOMIC_RELAXED);'''},
21202120
]
21212121

21222122
foreach check : atomic_checks
21232123
test = '''
2124+
#include <stdint.h>
21242125
int main(void)
21252126
{
21262127
@0@

0 commit comments

Comments
 (0)