1
0
mirror of https://github.com/postgres/postgres.git synced 2025-05-17 06:41:24 +03:00

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.
This commit is contained in:
Tom Lane 2009-03-03 00:17:44 +00:00
parent 1f3832b5d2
commit 80be60530f

View File

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