summaryrefslogtreecommitdiff
path: root/src/bin/psql/psqlscan.l
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/psql/psqlscan.l')
-rw-r--r--src/bin/psql/psqlscan.l6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l
index 4be4ed389d..09b4c83d74 100644
--- a/src/bin/psql/psqlscan.l
+++ b/src/bin/psql/psqlscan.l
@@ -33,7 +33,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.21 2007/01/05 22:19:49 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.22 2007/10/13 20:18:41 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,8 +43,6 @@
#include <ctype.h>
-#include "mb/pg_wchar.h"
-
#include "common.h"
#include "settings.h"
#include "variables.h"
@@ -1021,7 +1019,7 @@ psql_scan_setup(PsqlScanState state,
/* Do we need to hack the character set encoding? */
state->encoding = pset.encoding;
- state->safe_encoding = PG_VALID_BE_ENCODING(state->encoding);
+ state->safe_encoding = pg_valid_server_encoding_id(state->encoding);
/* needed for prepare_buffer */
cur_state = state;