From: Andrew Dunstan <andrew@dunslane.net>
Date: Sun, 26 May 2024 21:34:45 +0000 (-0400)
Subject: Fix meson uuid header check so it works with MSVC
X-Git-Tag: REL_17_BETA2~106
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=7c655a04a2dc84b59ed6dce97bd38b79e734ecca;p=postgresql.git

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.
---

diff --git a/meson.build b/meson.build
index f5ca5cfed49..d6401fb8e30 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)