diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-03-03 00:17:44 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-03-03 00:17:44 +0000 |
| commit | 80be60530f7f372bcaa5caca02cb22cad514ee19 (patch) | |
| tree | 3c677653e62b802130230f28db2467a57f55d560 | |
| parent | 1f3832b5d2728e5d4333324dbbb1ecd4634ded14 (diff) | |
| download | postgresql-80be60530f7f372bcaa5caca02cb22cad514ee19.tar.gz postgresql-80be60530f7f372bcaa5caca02cb22cad514ee19.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 e3a76733380..a6978fd6e5b 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.125.2.6 2009/03/02 21:19:23 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.125.2.7 2009/03/03 00:17:44 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -64,9 +64,6 @@ #include "utils/guc.h" -#undef _ -#define _(x) err_gettext(x) - /* Global variables */ ErrorContextCallback *error_context_stack = NULL; @@ -184,6 +181,9 @@ err_gettext(const char *str) #endif } +#undef gettext +#define gettext(x) err_gettext(x) + /* * errstart --- begin an error-reporting cycle @@ -666,7 +666,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); \ |