upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-04-15 22:10:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ooops ... fix some confusion between gettext() and _() in my previous patch.

Browse source 
This has moved around in past releases, so just copying-and-pasting from HEAD
didn't work as intended.
This commit is contained in:
Tom Lane 2009-03-03 00:17:36 +00:00
parent 40df3efa76
commit d2fda36128
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/backend/utils/error/elog.c
View file

@ -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); \