NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitaf492eb

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 commitaf492ebCopy full SHA for af492eb

File tree

2 files changed

-10

lines changed

meson.build
src/include
- meson.build

2 files changed

-10

lines changed

`‎meson.build‎`

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1146,7 +1146,7 @@ Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))`
`1146`	`1146`	`foreachfunc: check_funcs`
`1147`	`1147`	`found= cc.has_function(func,dependencies: [readline],`
`1148`	`1148`	`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)`
`1150`	`1150`	`endforeach`
`1151`	`1151`
`1152`	`1152`	`check_vars= [`
`@@ -1156,7 +1156,7 @@ Use -Dreadline=disabled to disable readline support.'''.format(readline_dep))`
`1156`	`1156`	`]`
`1157`	`1157`
`1158`	`1158`	`foreachvar: check_vars`
`1159`		`- cdata.set('HAVE_'+var.to_upper(),`
	`1159`	`+ cdata.set('HAVE_'+var.to_upper(),`
`1160`	`1160`	`cc.has_header_symbol(readline_h, var,`
`1161`	`1161`	`args: test_c_args,include_directories: postgres_inc,`
`1162`	`1162`	`prefix:'#include <stdio.h>',`
`@@ -1311,7 +1311,7 @@ if sslopt in ['auto', 'openssl']`
`1311`	`1311`	`cdata.set('USE_OPENSSL',1,`
`1312`	`1312`	`description:'Define to 1 to build with OpenSSL support. (-Dssl=openssl)')`
`1313`	`1313`	`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.')`
`1315`	`1315`	`ssl_library='openssl'`
`1316`	`1316`	`else`
`1317`	`1317`	`ssl= not_found_dep`
`@@ -1599,8 +1599,7 @@ if cc.links('''`
`1599`	`1599`
`1600`	`1600`	`ifnot buggy_int128`
`1601`	`1601`	`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))`
`1604`	`1603`	`endif`
`1605`	`1604`	`endif`
`1606`	`1605`
`@@ -1642,8 +1641,8 @@ endif`
`1642`	`1641`	`# We use <stdbool.h> if we have it and it declares type bool as having`
`1643`	`1642`	`# size 1. Otherwise, c.h will fall back to declaring bool as unsigned char.`
`1644`	`1643`	`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`
`1647`	`1646`	`cdata.set('HAVE__BOOL',1)`
`1648`	`1647`	`cdata.set('PG_USE_STDBOOL',1)`
`1649`	`1648`	`endif`
`@@ -1670,7 +1669,7 @@ endforeach`
`1670`	`1669`
`1671`	`1670`
`1672`	`1671`	`if cc.has_function_attribute('visibility:default')and \`
`1673`		`- cc.has_function_attribute('visibility:hidden')`
	`1672`	`+cc.has_function_attribute('visibility:hidden')`
`1674`	`1673`	`cdata.set('HAVE_VISIBILITY_ATTRIBUTE',1)`
`1675`	`1674`
`1676`	`1675`	`# Only newer versions of meson know not to apply gnu_symbol_visibility =`
`@@ -3046,7 +3045,7 @@ meson_install_args = meson_args + ['install'] + {`
`3046`	`3045`	`'muon': []`
`3047`	`3046`	`}[meson_impl]`
`3048`	`3047`
`3049`		`-# setup tests shouldbe run first,`
	`3048`	`+# setup tests should be run first,`
`3050`	`3049`	`# so define priority for these`
`3051`	`3050`	`setup_tests_priority=100`
`3052`	`3051`	`test('tmp_install',`

`‎src/include/meson.build‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ install_headers(`
`89`	`89`	`'c.h',`
`90`	`90`	`'port.h',`
`91`	`91`	`'postgres_fe.h',`
`92`		`-install_dir: dir_include_internal`
	`92`	`+install_dir: dir_include_internal,`
`93`	`93`	`)`
`94`	`94`
`95`	`95`	`install_headers(`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitaf492eb

File tree

2 files changed

2 files changed

`‎meson.build‎`

`‎src/include/meson.build‎`

0 commit comments