Use the new text domain names ("postgres-8.4" instead of "postgres")

Hiroshi Inoue
This commit is contained in:
Magnus Hagander 2009-01-19 15:34:23 +00:00
parent 0a9ddf72cf
commit cfb9c7f8b5
2 changed files with 4 additions and 4 deletions

View File

@ -42,7 +42,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.211 2009/01/07 04:26:46 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.212 2009/01/19 15:34:23 mha Exp $
*
*-------------------------------------------------------------------------
*/
@ -308,7 +308,7 @@ errstart(int elevel, const char *filename, int lineno,
edata->lineno = lineno;
edata->funcname = funcname;
/* the default text domain is the backend's */
edata->domain = domain ? domain : "postgres";
edata->domain = domain ? domain : PG_TEXTDOMAIN("postgres");
/* Select default errcode based on elevel */
if (elevel >= ERROR)
edata->sqlerrcode = ERRCODE_INTERNAL_ERROR;

View File

@ -4,7 +4,7 @@
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
*
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.76 2009/01/04 18:37:35 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.77 2009/01/19 15:34:23 mha Exp $
*/
#include "postgres.h"
@ -873,7 +873,7 @@ SetDatabaseEncoding(int encoding)
*/
#ifdef ENABLE_NLS
if (encoding == PG_UTF8)
if (bind_textdomain_codeset("postgres", "UTF-8") == NULL)
if (bind_textdomain_codeset(textdomain(NULL), "UTF-8") == NULL)
elog(LOG, "bind_textdomain_codeset failed");
#endif
}