mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-30 02:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: simplify __thread check and fix MinGW

Browse Source 
> was missing.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2025-11-23 14:50:55 -08:00
parent af2671a212
commit a0c6bb32dd
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@@ -124,16 +124,12 @@ foreach d, h : decls
endif endif
endforeach endforeach
check_thread = cc.compiles(''' check_thread = cc.compiles('__thread int x;', name: 'Check for __thread support')
__thread int x = 0;
int main() { return x; }
''',
name: 'Check for __thread support')
if check_thread if check_thread
conf_data.set('HAVE___THREAD', 1) conf_data.set('HAVE___THREAD', 1)
conf_data.set('SPEC___THREAD', '__thread') conf_data.set('SPEC___THREAD', '__thread')
elif cc.get_id().contains('msvc') elif cc.get_argument_syntax() == 'msvc'
conf_data.set('SPEC___THREAD', '__declspec(thread)') conf_data.set('SPEC___THREAD', '__declspec(thread)')
endif endif
@@ -212,7 +208,6 @@ json_header = configure_file(
configuration: jhconf_data configuration: jhconf_data
) )
# Platform-specific flags # Platform-specific flags
add_project_arguments('-D_GNU_SOURCE', language: 'c') add_project_arguments('-D_GNU_SOURCE', language: 'c')