postgres.git / summary / log / commit / refs

commit    d53f22de868bf5dc9eb2d7e3750e3b484b0645e0
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Fri Jul 08 15:25:36 2005 +0000
First released in: 8.1.0, 7.3.11, 7.4.9, 8.0.4

    Make libpq_gettext save and restore errno in a Windows-compatible way.
    Also, back-patch fix into back branches.


 src/interfaces/libpq/fe-misc.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 5008d5bf632..e6dcbd24dc4 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -25,7 +25,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.85.2.1 2003/08/04 17:25:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.85.2.2 2005/07/08 15:25:36 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -920,8 +920,16 @@ libpq_gettext(const char *msgid)
 
 	if (!already_bound)
 	{
+		/* dgettext() preserves errno, but bindtextdomain() doesn't */
+		int		save_errno = errno;
+
 		already_bound = 1;
 		bindtextdomain("libpq", LOCALEDIR);
+#ifdef WIN32
+		SetLastError(save_errno);
+#else
+		errno = save_errno;
+#endif
 	}
 
 	return dgettext("libpq", msgid);


[parent: 577759f8bf53]