From 7c655a04a2dc84b59ed6dce97bd38b79e734ecca Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Sun, 26 May 2024 17:34:45 -0400 Subject: [PATCH] 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. --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f5ca5cfed4..d6401fb8e3 100644 --- a/meson.build +++ b/meson.build @@ -1353,7 +1353,10 @@ if uuidopt != 'none' error('unknown uuid build option value: @0@'.format(uuidopt)) endif - if not cc.has_header_symbol(uuidheader, uuidfunc, args: test_c_args, dependencies: uuid) + if not cc.has_header_symbol(uuidheader, uuidfunc, + args: test_c_args, + include_directories: postgres_inc, + dependencies: uuid) error('uuid library @0@ missing required function @1@'.format(uuidopt, uuidfunc)) endif cdata.set('HAVE_@0@'.format(uuidheader.underscorify().to_upper()), 1)