NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit54aa6cc

committed

Make pgwin32_putenv() probe every known CRT, regardless of compiler.

This extends to MinGW builds the provision for MSVC-built libraries tosee putenv() effects. Doing so repairs, for example, the handling ofthe krb_server_keyfile parameter when linked with MSVC-built MITKerberos. Like the previous commit, no back-patch.

1 parent202dbdb commit54aa6ccCopy full SHA for 54aa6cc

File tree

1 file changed

-5

lines changed

src/port
- win32env.c

1 file changed

-5

lines changed

`‎src/port/win32env.c‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ pgwin32_putenv(const char *envval)`
`21`	`21`	`{`
`22`	`22`	`char*envcpy;`
`23`	`23`	`char*cp;`
`24`		`-#ifdef_MSC_VER`
`25`	`24`	`typedefint (_cdeclPUTENVPROC) (constchar);`
`26`	`25`	`staticconstchar*constmodulenames[]= {`
`27`	`26`	`"msvcrt",/* Visual Studio 6.0 / MinGW */`
`@@ -45,7 +44,6 @@ pgwin32_putenv(const char *envval)`
`45`	`44`	`NULL`
`46`	`45`	`};`
`47`	`46`	`inti;`
`48`		`-#endif/* _MSC_VER */`
`49`	`47`
`50`	`48`	`/*`
`51`	`49`	`* Update process environment, making this change visible to child`
`@@ -88,7 +86,6 @@ pgwin32_putenv(const char *envval)`
`88`	`86`	`* against. Addresses within these modules may become invalid the moment`
`89`	`87`	`* we call FreeLibrary(), so don't cache them.`
`90`	`88`	`*/`
`91`		`-#ifdef_MSC_VER`
`92`	`89`	`for (i=0;modulenames[i];i++)`
`93`	`90`	`{`
`94`	`91`	`HMODULEhmodule=NULL;`
`@@ -104,9 +101,12 @@ pgwin32_putenv(const char *envval)`
`104`	`101`	`FreeLibrary(hmodule);`
`105`	`102`	`}`
`106`	`103`	`}`
`107`		`-#endif/* _MSC_VER */`
`108`	`104`
`109`		`-/* Finally, update our "own" cache */`
	`105`	`+/*`
	`106`	`+ * Finally, update our "own" cache. This is redundant with the loop`
	`107`	`+ * above, except when PostgreSQL itself links to a CRT not listed above.`
	`108`	`+ * Ideally, the loop does visit all possible CRTs, making this redundant.`
	`109`	`+ */`
`110`	`110`	`return_putenv(envval);`
`111`	`111`	`}`
`112`	`112`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit54aa6cc

File tree

1 file changed

1 file changed

`‎src/port/win32env.c‎`

0 commit comments