Commit373679c

committed

meson: Define HAVE_LOCALE_T for msvc

Meson doesn't see the redefinition of locale_t done insrc/include/port/win32_port.h, so it is not defining HAVE_LOCALE_T,HAVE_WCSTOMBS_L nor HAVE_MBSTOWCS_L as the currentsrc/tools/msvc/build.pl script does. Add manual overrides to fix.Author: Author: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/CAC%2BAXB1wJEqfKCuVcNpoH%3Dgxd61N%3D7c2fR3Ew6YRPpSfEUA%3DyQ%40mail.gmail.com

1 parentb9424d0 commit373679cCopy full SHA for 373679c

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2193,12 +2193,15 @@ endif`
`2193`	`2193`
`2194`	`2194`	`# Check for the locale_t type and find the right header file. macOS`
`2195`	`2195`	`# needs xlocale.h; standard is locale.h, but glibc also has an`
`2196`		`-# xlocale.h file that we should not use.`
	`2196`	`+# xlocale.h file that we should not use. MSVC has a replacement`
	`2197`	`+# defined in src/include/port/win32_port.h.`
`2197`	`2198`	`if cc.has_type('locale_t',prefix:'#include <locale.h>')`
`2198`	`2199`	`cdata.set('HAVE_LOCALE_T',1)`
`2199`	`2200`	`elif cc.has_type('locale_t',prefix:'#include <xlocale.h>')`
`2200`	`2201`	`cdata.set('HAVE_LOCALE_T',1)`
`2201`	`2202`	`cdata.set('LOCALE_T_IN_XLOCALE',1)`
	`2203`	`+elif cc.get_id()=='msvc'`
	`2204`	`+ cdata.set('HAVE_LOCALE_T',1)`
`2202`	`2205`	`endif`
`2203`	`2206`
`2204`	`2207`	`# Check if the C compiler understands typeof or a variant. Define`
`@@ -2411,6 +2414,13 @@ if cc.has_function('syslog', args: test_c_args) and \`
`2411`	`2414`	`endif`
`2412`	`2415`
`2413`	`2416`
	`2417`	`+# MSVC has replacements defined in src/include/port/win32_port.h.`
	`2418`	`+if cc.get_id()=='msvc'`
	`2419`	`+ cdata.set('HAVE_WCSTOMBS_L',1)`
	`2420`	`+ cdata.set('HAVE_MBSTOWCS_L',1)`
	`2421`	`+endif`
	`2422`	`+`
	`2423`	`+`
`2414`	`2424`	`# if prerequisites for unnamed posix semas aren't fulfilled, fall back to sysv`
`2415`	`2425`	`# semaphores`
`2416`	`2426`	`if sema_kind=='unnamed_posix'and \`

Comments

(0)