Commit91d381e

committed

Make libpq_gettext save and restore errno in a Windows-compatible way.

Also, back-patch fix into back branches.

1 parent224501e commit91d381eCopy full SHA for 91d381e

File tree

-1

lines changed

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`*`
`27`	`27`	`* IDENTIFICATION`
`28`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.65 2001/12/03 00:28:24 tgl Exp $`
	`28`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.65.2.1 2005/07/08 15:25:46 tgl Exp $`
`29`	`29`	`*`
`30`	`30`	`*-------------------------------------------------------------------------`
`31`	`31`	`*/`
`@@ -844,8 +844,16 @@ libpq_gettext(const char *msgid)`
`844`	`844`
`845`	`845`	`if (!already_bound)`
`846`	`846`	`{`
	`847`	`+/* dgettext() preserves errno, but bindtextdomain() doesn't */`
	`848`	`+intsave_errno=errno;`
	`849`	`+`
`847`	`850`	`already_bound=1;`
`848`	`851`	`bindtextdomain("libpq",LOCALEDIR);`
	`852`	`+#ifdefWIN32`
	`853`	`+SetLastError(save_errno);`
	`854`	`+#else`
	`855`	`+errno=save_errno;`
	`856`	`+#endif`
`849`	`857`	`}`
`850`	`858`
`851`	`859`	`returndgettext("libpq",msgid);`

Comments

(0)