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

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:44 +00:00
parent 1f3832b5d2
commit 80be60530f
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

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * 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" #include "utils/guc.h"
#undef _
#define _(x) err_gettext(x)
/* Global variables */ /* Global variables */
ErrorContextCallback *error_context_stack = NULL; ErrorContextCallback *error_context_stack = NULL;
@ -184,6 +181,9 @@ err_gettext(const char *str)
#endif #endif
} }
#undef gettext
#define gettext(x) err_gettext(x)
/* /*
* errstart --- begin an error-reporting cycle * errstart --- begin an error-reporting cycle
@ -666,7 +666,7 @@ errcode_for_socket_access(void)
char *fmtbuf; \ char *fmtbuf; \
StringInfoData buf; \ StringInfoData buf; \
/* Internationalize the error format string */ \ /* Internationalize the error format string */ \
if (translateit && !in_error_recursion_trouble()) \ if (translateit) \
fmt = gettext(fmt); \ fmt = gettext(fmt); \
/* Expand %m in format string */ \ /* Expand %m in format string */ \
fmtbuf = expand_fmt_string(fmt, edata); \ fmtbuf = expand_fmt_string(fmt, edata); \