<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b644bb0de631924e8379471b81acd8615f4a6e5f">https://github.com/macports/macports-ports/commit/b644bb0de631924e8379471b81acd8615f4a6e5f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b644bb0de631924e8379471b81acd8615f4a6e5f
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Sat May 10 09:58:38 2025 -0400
<span style='display:block; white-space:pre;color:#404040;'> postgresql14: update to 14.18
</span>---
databases/postgresql14/Portfile | 13 +-
databases/postgresql14/files/patch-strchrnul.diff | 187 ----------------------
2 files changed, 5 insertions(+), 195 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql14/Portfile b/databases/postgresql14/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea62efd7f08..9f4c64e5083 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup muniversal 1.0
</span>
#remember to update the -doc and -server as well
name postgresql14
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 14.17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 14.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories databases
maintainers {gmail.com:davidgilman1 @dgilman} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ master_sites http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org
</span> postgresql:source/v${version}/
distname postgresql-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 58f979d80e63ad5b340570619634489ba8b7f3d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6ce0ccd6403bf7f0f2eddd333e2ee9ba02edfa977c66660ed9b4b1057e7630a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22488812
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2f8fb562333968c53c677d99671fba5ca57149e0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 83ab29d6bfc3dc58b2ed3c664114fdfbeb6a0450c4b8d7fa69aee91e3ca14f8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22503241
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,9 +43,6 @@ platform darwin powerpc {
</span> patchfiles-append patch-icu.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://www.postgresql.org/message-id/flat/E1tziZ6-002AW9-2C%40gemulon.postgresql.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-strchrnul.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:readline path:lib/libssl.dylib:openssl port:zlib port:libxml2 port:libxslt path:lib/pkgconfig/icu-uc.pc:icu path:lib/libgssapi_krb5.dylib:kerberos5
depends_build port:bison port:pkgconfig
depends_run port:postgresql_select-14
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql14/files/patch-strchrnul.diff b/databases/postgresql14/files/patch-strchrnul.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ddf394d3e59..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql14/files/patch-strchrnul.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,187 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 71790aef1a6eea6f9662a1edcd669d89d5486b03 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 1 Apr 2025 16:49:51 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix detection and handling of strchrnul() for macOS 15.4.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-As of 15.4, macOS has strchrnul(), but access to it is blocked behind
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a check for MACOSX_DEPLOYMENT_TARGET >= 15.4. But our does-it-link
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure check finds it, so we try to use it, and fail with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-present default deployment target (namely 15.0). This accounts for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-today's buildfarm failures on indri and sifaka.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This is the identical problem that we faced some years ago when Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-introduced preadv and pwritev in the same way. We solved that in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit f014b1b9b by using AC_CHECK_DECLS instead of AC_CHECK_FUNCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to check the functions' availability. So do the same now for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-strchrnul(). Interestingly, we already had a workaround for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"the link check doesn't agree with <string.h>" cases with glibc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-which we no longer need since only the header declaration is being
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checked.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Testing this revealed that the meson version of this check has never
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worked, because it failed to use "-Werror=unguarded-availability-new".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(Apparently nobody's tried to build with meson on macOS versions that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-lack preadv/pwritev as standard.) Adjust that while at it. Also,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-we had never put support for "-Werror=unguarded-availability-new"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-into v13, but we need that now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Co-authored-by: Tom Lane <tgl@sss.pgh.pa.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Co-authored-by: Peter Eisentraut <peter@eisentraut.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Discussion: https://postgr.es/m/385134.1743523038@sss.pgh.pa.us
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Backpatch-through: 13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure | 14 +++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/include/pg_config.h.in | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/port/snprintf.c | 29 +++++++++++++----------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/tools/msvc/Solution.pm | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5 files changed, 32 insertions(+), 22 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fa9085b1c0dde..33bc3203b36b0 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16037,7 +16037,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_including_readline="$LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for ac_func in backtrace_symbols clock_gettime copyfile fdatasync getifaddrs getpeerucred getrlimit kqueue mbstowcs_l memset_s poll posix_fallocate ppoll pstat pthread_is_threaded_np readlink readv setproctitle setproctitle_fast setsid shm_open strchrnul strsignal symlink syncfs sync_file_range uselocale wcstombs_l writev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for ac_func in backtrace_symbols clock_gettime copyfile fdatasync getifaddrs getpeerucred getrlimit kqueue mbstowcs_l memset_s poll posix_fallocate ppoll pstat pthread_is_threaded_np readlink readv setproctitle setproctitle_fast setsid shm_open strsignal symlink syncfs sync_file_range uselocale wcstombs_l writev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16601,6 +16601,18 @@ esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_fn_c_check_decl "$LINENO" "strchrnul" "ac_cv_have_decl_strchrnul" "#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_have_decl_strchrnul" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_have_decl=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_have_decl=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_DECL_STRCHRNUL $ac_have_decl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is probably only present on macOS, but may as well check always
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_fn_c_check_decl "$LINENO" "F_FULLFSYNC" "ac_cv_have_decl_F_FULLFSYNC" "#include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 35dc9f74b7369..53d341c175125 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1807,7 +1807,6 @@ AC_CHECK_FUNCS(m4_normalize([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setproctitle_fast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setsid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shm_open
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- strchrnul
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strsignal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- syncfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1849,6 +1848,7 @@ AC_CHECK_DECLS([strlcat, strlcpy, strnlen])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # won't handle deployment target restrictions on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_DECLS([preadv], [], [AC_LIBOBJ(preadv)], [#include <sys/uio.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_DECLS([pwritev], [], [AC_LIBOBJ(pwritev)], [#include <sys/uio.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CHECK_DECLS([strchrnul], [], [], [#include <string.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is probably only present on macOS, but may as well check always
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/include/pg_config.h.in src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d9ef9a41bf298..605c830a1b284 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/include/pg_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,6 +155,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- don't. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_DECL_RTLD_NOW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Define to 1 if you have the declaration of `strchrnul', and to 0 if you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ don't. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_DECL_STRCHRNUL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the declaration of `strlcat', and to 0 if you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- don't. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_DECL_STRLCAT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -523,9 +527,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the <stdlib.h> header file. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* Define to 1 if you have the `strchrnul' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#undef HAVE_STRCHRNUL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the `strerror_r' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_STRERROR_R
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/port/snprintf.c src/port/snprintf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8306ab4f2b8dc..79c5f523bf16d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/port/snprintf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/port/snprintf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,13 +348,22 @@ static void leading_pad(int zpad, int signvalue, int *padlen,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void trailing_pad(int padlen, PrintfTarget *target);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * If strchrnul exists (it's a glibc-ism), it's a good bit faster than the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * equivalent manual loop. If it doesn't exist, provide a replacement.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * If strchrnul exists (it's a glibc-ism, but since adopted by some other
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * platforms), it's a good bit faster than the equivalent manual loop.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Use it if possible, and if it doesn't exist, use this replacement.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Note: glibc declares this as returning "char *", but that would require
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * casting away const internally, so we don't follow that detail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Note: macOS has this too as of Sequoia 15.4, but it's hidden behind
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * a deployment-target check that causes compile errors if the deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * target isn't high enough. So !HAVE_DECL_STRCHRNUL may mean "yes it's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * declared, but it doesn't compile". To avoid failing in that scenario,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * use a macro to avoid matching <string.h>'s name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef HAVE_STRCHRNUL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !HAVE_DECL_STRCHRNUL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define strchrnul pg_strchrnul
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline const char *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strchrnul(const char *s, int c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,19 +373,7 @@ strchrnul(const char *s, int c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * glibc's <string.h> declares strchrnul only if _GNU_SOURCE is defined.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * While we typically use that on glibc platforms, configure will set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * HAVE_STRCHRNUL whether it's used or not. Fill in the missing declaration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * so that this file will compile cleanly with or without _GNU_SOURCE.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef _GNU_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *strchrnul(const char *s, int c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* HAVE_STRCHRNUL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !HAVE_DECL_STRCHRNUL */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/tools/msvc/Solution.pm src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f0ce2ac80403b..040e9d98b1fef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tools/msvc/Solution.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -248,6 +248,7 @@ sub GenerateFiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_DECL_PWRITEV => 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_DECL_RTLD_GLOBAL => 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_DECL_RTLD_NOW => 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_DECL_STRCHRNUL => 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_DECL_STRLCAT => 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_DECL_STRLCPY => 0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_DECL_STRNLEN => 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -367,7 +368,6 @@ sub GenerateFiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_SRANDOM => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STDINT_H => 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STDLIB_H => 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HAVE_STRCHRNUL => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STRERROR_R => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STRINGS_H => undef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STRING_H => 1,
</span></pre><pre style='margin:0'>
</pre>