NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7c655a0

committed

Fix meson uuid header check so it works with MSVC

The OSSP uuid.h file includes unistd.h, so to use it with MSVC we need toinclude the postgres include directories so it picks up our version ofthat in src/include/port/win32_msvc. Adjust the meson test accordingly.

1 parent8285b48 commit7c655a0Copy full SHA for 7c655a0

File tree

1 file changed

-1

lines changed

meson.build

1 file changed

-1

lines changed

`‎meson.build‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1353,7 +1353,10 @@ if uuidopt != 'none'`
`1353`	`1353`	`error('unknown uuid build option value: @0@'.format(uuidopt))`
`1354`	`1354`	`endif`
`1355`	`1355`
`1356`		`-ifnot cc.has_header_symbol(uuidheader, uuidfunc,args: test_c_args,dependencies: uuid)`
	`1356`	`+ifnot cc.has_header_symbol(uuidheader, uuidfunc,`
	`1357`	`+args: test_c_args,`
	`1358`	`+include_directories: postgres_inc,`
	`1359`	`+dependencies: uuid)`
`1357`	`1360`	`error('uuid library @0@ missing required function @1@'.format(uuidopt, uuidfunc))`
`1358`	`1361`	`endif`
`1359`	`1362`	`cdata.set('HAVE_@0@'.format(uuidheader.underscorify().to_upper()),1)`

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!

Commit7c655a0

File tree

1 file changed

1 file changed

`‎meson.build‎`

0 commit comments