From: Noah Misch <noah@leadboat.com>
Date: Sat, 3 Dec 2016 20:46:36 +0000 (-0500)
Subject: Make pgwin32_putenv() visit debug CRTs.
X-Git-Tag: REL_10_BETA1~1318
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=95b9b8a3977f854e0bfb2a5614b699b7774ae673;p=postgresql.git

Make pgwin32_putenv() visit debug CRTs.

This has no effect in the most conventional case, where no relevant DLL
uses a debug build.  For an example where it does matter, given a debug
build of MIT Kerberos, the krb_server_keyfile parameter usually had no
effect.  Since nobody wants a Heisenbug, back-patch to 9.2 (all
supported versions).

Christian Ullrich, reviewed by Michael Paquier.
---

diff --git a/src/port/win32env.c b/src/port/win32env.c
index 188215876bb..4e4cb5e294d 100644
--- a/src/port/win32env.c
+++ b/src/port/win32env.c
@@ -40,30 +40,57 @@ pgwin32_putenv(const char *envval)
 		{
 			"msvcrt", NULL, NULL
 		},						/* Visual Studio 6.0 / MinGW */
+		{
+			"msvcrtd", NULL, NULL
+		},
 		{
 			"msvcr70", NULL, NULL
 		},						/* Visual Studio 2002 */
+		{
+			"msvcr70d", NULL, NULL
+		},
 		{
 			"msvcr71", NULL, NULL
 		},						/* Visual Studio 2003 */
+		{
+			"msvcr71d", NULL, NULL
+		},
 		{
 			"msvcr80", NULL, NULL
 		},						/* Visual Studio 2005 */
+		{
+			"msvcr80d", NULL, NULL
+		},
 		{
 			"msvcr90", NULL, NULL
 		},						/* Visual Studio 2008 */
+		{
+			"msvcr90d", NULL, NULL
+		},
 		{
 			"msvcr100", NULL, NULL
 		},						/* Visual Studio 2010 */
+		{
+			"msvcr100d", NULL, NULL
+		},
 		{
 			"msvcr110", NULL, NULL
 		},						/* Visual Studio 2012 */
+		{
+			"msvcr110d", NULL, NULL
+		},
 		{
 			"msvcr120", NULL, NULL
 		},						/* Visual Studio 2013 */
+		{
+			"msvcr120d", NULL, NULL
+		},
 		{
 			"ucrtbase", NULL, NULL
 		},						/* Visual Studio 2015 and later */
+		{
+			"ucrtbased", NULL, NULL
+		},
 		{
 			NULL, NULL, NULL
 		}