Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7c655a0

Browse files
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 to include the postgres include directories so it picks up our version of that in src/include/port/win32_msvc. Adjust the meson test accordingly.
1 parent 8285b48 commit 7c655a0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

meson.build

+4-1
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,10 @@ if uuidopt != 'none'
13531353
error('unknown uuid build option value: @0@'.format(uuidopt))
13541354
endif
13551355

1356-
if not cc.has_header_symbol(uuidheader, uuidfunc, args: test_c_args, dependencies: uuid)
1356+
if not cc.has_header_symbol(uuidheader, uuidfunc,
1357+
args: test_c_args,
1358+
include_directories: postgres_inc,
1359+
dependencies: uuid)
13571360
error('uuid library @0@ missing required function @1@'.format(uuidopt, uuidfunc))
13581361
endif
13591362
cdata.set('HAVE_@0@'.format(uuidheader.underscorify().to_upper()), 1)

0 commit comments

Comments
 (0)