Make pgwin32_putenv() visit debug CRTs.

nmisch · nmisch · commit 95b9b8a3977f · 2016-12-03T15:46:36.000-05:00
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
@@ -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
 		}

Original file line number	Diff line number	Diff line change
`@@ -40,30 +40,57 @@ pgwin32_putenv(const char *envval)`
`40`	`40`	`{`
`41`	`41`	`"msvcrt", NULL, NULL`
`42`	`42`	`}, /* Visual Studio 6.0 / MinGW */`
	`43`	`+ {`
	`44`	`+ "msvcrtd", NULL, NULL`
	`45`	`+ },`
`43`	`46`	`{`
`44`	`47`	`"msvcr70", NULL, NULL`
`45`	`48`	`}, /* Visual Studio 2002 */`
	`49`	`+ {`
	`50`	`+ "msvcr70d", NULL, NULL`
	`51`	`+ },`
`46`	`52`	`{`
`47`	`53`	`"msvcr71", NULL, NULL`
`48`	`54`	`}, /* Visual Studio 2003 */`
	`55`	`+ {`
	`56`	`+ "msvcr71d", NULL, NULL`
	`57`	`+ },`
`49`	`58`	`{`
`50`	`59`	`"msvcr80", NULL, NULL`
`51`	`60`	`}, /* Visual Studio 2005 */`
	`61`	`+ {`
	`62`	`+ "msvcr80d", NULL, NULL`
	`63`	`+ },`
`52`	`64`	`{`
`53`	`65`	`"msvcr90", NULL, NULL`
`54`	`66`	`}, /* Visual Studio 2008 */`
	`67`	`+ {`
	`68`	`+ "msvcr90d", NULL, NULL`
	`69`	`+ },`
`55`	`70`	`{`
`56`	`71`	`"msvcr100", NULL, NULL`
`57`	`72`	`}, /* Visual Studio 2010 */`
	`73`	`+ {`
	`74`	`+ "msvcr100d", NULL, NULL`
	`75`	`+ },`
`58`	`76`	`{`
`59`	`77`	`"msvcr110", NULL, NULL`
`60`	`78`	`}, /* Visual Studio 2012 */`
	`79`	`+ {`
	`80`	`+ "msvcr110d", NULL, NULL`
	`81`	`+ },`
`61`	`82`	`{`
`62`	`83`	`"msvcr120", NULL, NULL`
`63`	`84`	`}, /* Visual Studio 2013 */`
	`85`	`+ {`
	`86`	`+ "msvcr120d", NULL, NULL`
	`87`	`+ },`
`64`	`88`	`{`
`65`	`89`	`"ucrtbase", NULL, NULL`
`66`	`90`	`}, /* Visual Studio 2015 and later */`
	`91`	`+ {`
	`92`	`+ "ucrtbased", NULL, NULL`
	`93`	`+ },`
`67`	`94`	`{`
`68`	`95`	`NULL, NULL, NULL`
`69`	`96`	`}`