From cfb9c7f8b5cc8a1ee126fa787b6caf8eaea36461 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Mon, 19 Jan 2009 15:34:23 +0000
Subject: [PATCH] Use the new text domain names ("postgres-8.4" instead of
"postgres")
Hiroshi Inoue
---
src/backend/utils/error/elog.c | 4 ++--
src/backend/utils/mb/mbutils.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index a4a19967bab..67f8c24b490 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -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;
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 4831e4da48f..1f667d54a90 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -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
}
--
GitLab