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

tglsfdc · tglsfdc · commit 70f7da3e6ec8 · 2005-07-08T15:24:41.000Z
Also, back-patch fix into back branches.
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.115 2005/07/06 16:25:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.116 2005/07/08 15:24:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1142,7 +1142,11 @@ libpq_gettext(const char *msgid)
 		if (!ldir)
 			ldir = LOCALEDIR;
 		bindtextdomain("libpq", ldir);
+#ifdef WIN32
+		SetLastError(save_errno);
+#else
 		errno = save_errno;
+#endif
 	}
 
 	return dgettext("libpq", msgid);

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* Portions Copyright (c) 1994, Regents of the University of California`
`24`	`24`	`*`
`25`	`25`	`* IDENTIFICATION`
`26`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.115 2005/07/06 16:25:59 tgl Exp $`
	`26`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.116 2005/07/08 15:24:41 tgl Exp $`
`27`	`27`	`*`
`28`	`28`	`*-------------------------------------------------------------------------`
`29`	`29`	`*/`
`@@ -1142,7 +1142,11 @@ libpq_gettext(const char *msgid)`
`1142`	`1142`	`if (!ldir)`
`1143`	`1143`	`ldir = LOCALEDIR;`
`1144`	`1144`	`bindtextdomain("libpq", ldir);`
	`1145`	`+#ifdef WIN32`
	`1146`	`+ SetLastError(save_errno);`
	`1147`	`+#else`
`1145`	`1148`	`errno = save_errno;`
	`1149`	`+#endif`
`1146`	`1150`	`}`
`1147`	`1151`
`1148`	`1152`	`return dgettext("libpq", msgid);`