diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-03-03 00:17:36 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-03-03 00:17:36 +0000 |
| commit | d2fda36128a3e0a8b4698e7783a3710034425f8f (patch) | |
| tree | bdbb4ff63d4ebdc49e82b57f509b7c8d615c3ad0 | |
| parent | 40df3efa763cd00c0ee4fe0cec3a650afb710e46 (diff) | |
| download | postgresql-d2fda36128a3e0a8b4698e7783a3710034425f8f.tar.gz postgresql-d2fda36128a3e0a8b4698e7783a3710034425f8f.zip | |
Ooops ... fix some confusion between gettext() and _() in my previous patch.
This has moved around in past releases, so just copying-and-pasting from HEAD
didn't work as intended.
| -rw-r--r-- | src/backend/utils/error/elog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 0532ce2cf9e..6ad177e0251 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.155.4.10 2009/03/02 21:19:13 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.155.4.11 2009/03/03 00:17:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -70,9 +70,6 @@ #include "utils/ps_status.h" -#undef _ -#define _(x) err_gettext(x) - /* Global variables */ ErrorContextCallback *error_context_stack = NULL; @@ -159,6 +156,9 @@ err_gettext(const char *str) #endif } +#undef gettext +#define gettext(x) err_gettext(x) + /* * errstart --- begin an error-reporting cycle @@ -645,7 +645,7 @@ errcode_for_socket_access(void) char *fmtbuf; \ StringInfoData buf; \ /* Internationalize the error format string */ \ - if (translateit && !in_error_recursion_trouble()) \ + if (translateit) \ fmt = gettext(fmt); \ /* Expand %m in format string */ \ fmtbuf = expand_fmt_string(fmt, edata); \ |