Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaf492eb

Browse files
committed
meson: Make some Meson style more consistent with surrounding code
Author: Tristan Partin <tristan@neon.tech>Discussion:https://www.postgresql.org/message-id/flat/CSPIJVUDZFKX.3KHMOAVGF94RV%40c3po
1 parent74668cb commitaf492eb

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

‎meson.build

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))
11461146
foreachfunc: check_funcs
11471147
found= cc.has_function(func,dependencies: [readline],
11481148
args: test_c_args,include_directories: postgres_inc)
1149-
cdata.set('HAVE_'+func.to_upper(), found ?1 :false)
1149+
cdata.set('HAVE_'+func.to_upper(), found ?1 :false)
11501150
endforeach
11511151

11521152
check_vars= [
@@ -1156,7 +1156,7 @@ Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))
11561156
]
11571157

11581158
foreachvar: check_vars
1159-
cdata.set('HAVE_'+var.to_upper(),
1159+
cdata.set('HAVE_'+var.to_upper(),
11601160
cc.has_header_symbol(readline_h, var,
11611161
args: test_c_args,include_directories: postgres_inc,
11621162
prefix:'#include <stdio.h>',
@@ -1311,7 +1311,7 @@ if sslopt in ['auto', 'openssl']
13111311
cdata.set('USE_OPENSSL',1,
13121312
description:'Define to 1 to build with OpenSSL support. (-Dssl=openssl)')
13131313
cdata.set('OPENSSL_API_COMPAT','0x10001000L',
1314-
description:'''Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.''')
1314+
description:'Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.')
13151315
ssl_library='openssl'
13161316
else
13171317
ssl= not_found_dep
@@ -1599,8 +1599,7 @@ if cc.links('''
15991599

16001600
ifnot buggy_int128
16011601
cdata.set('PG_INT128_TYPE','__int128')
1602-
cdata.set('ALIGNOF_PG_INT128_TYPE', cc.
1603-
alignment('__int128',args: test_c_args))
1602+
cdata.set('ALIGNOF_PG_INT128_TYPE', cc.alignment('__int128',args: test_c_args))
16041603
endif
16051604
endif
16061605

@@ -1642,8 +1641,8 @@ endif
16421641
# We use <stdbool.h> if we have it and it declares type bool as having
16431642
# size 1. Otherwise, c.h will fall back to declaring bool as unsigned char.
16441643
if cc.has_type('_Bool',args: test_c_args) \
1645-
and cc.has_type('bool',prefix:'#include <stdbool.h>',args: test_c_args) \
1646-
and cc.sizeof('bool',prefix:'#include <stdbool.h>',args: test_c_args)==1
1644+
and cc.has_type('bool',prefix:'#include <stdbool.h>',args: test_c_args) \
1645+
and cc.sizeof('bool',prefix:'#include <stdbool.h>',args: test_c_args)==1
16471646
cdata.set('HAVE__BOOL',1)
16481647
cdata.set('PG_USE_STDBOOL',1)
16491648
endif
@@ -1670,7 +1669,7 @@ endforeach
16701669

16711670

16721671
if cc.has_function_attribute('visibility:default')and \
1673-
cc.has_function_attribute('visibility:hidden')
1672+
cc.has_function_attribute('visibility:hidden')
16741673
cdata.set('HAVE_VISIBILITY_ATTRIBUTE',1)
16751674

16761675
# Only newer versions of meson know not to apply gnu_symbol_visibility =
@@ -3046,7 +3045,7 @@ meson_install_args = meson_args + ['install'] + {
30463045
'muon': []
30473046
}[meson_impl]
30483047

3049-
# setup tests shouldbe run first,
3048+
# setup tests should be run first,
30503049
# so define priority for these
30513050
setup_tests_priority=100
30523051
test('tmp_install',

‎src/include/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ install_headers(
8989
'c.h',
9090
'port.h',
9191
'postgres_fe.h',
92-
install_dir: dir_include_internal
92+
install_dir: dir_include_internal,
9393
)
9494

9595
install_headers(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp