diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-08 15:25:19 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-07-08 15:25:19 +0000 |
| commit | a5d10d66d1c8768974ae6245bdff8f28e0dab31f (patch) | |
| tree | 3f08eeeff5f21886192589713796f9446cb51c03 /src | |
| parent | 4677334cedf56383fd4f472f748de8d8d9f101d0 (diff) | |
| download | postgresql-a5d10d66d1c8768974ae6245bdff8f28e0dab31f.tar.gz postgresql-a5d10d66d1c8768974ae6245bdff8f28e0dab31f.zip | |
Make libpq_gettext save and restore errno in a Windows-compatible way.
Also, back-patch fix into back branches.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 4349a4e05aa..0f3f2813711 100644 --- 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 - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.103 2003/10/19 21:36:41 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.103.2.1 2005/07/08 15:25:19 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1120,8 +1120,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); |