diff options
| author | Tatsuo Ishii <ishii@postgresql.org> | 2002-08-29 07:22:30 +0000 |
|---|---|---|
| committer | Tatsuo Ishii <ishii@postgresql.org> | 2002-08-29 07:22:30 +0000 |
| commit | ed7baeaf4df676489106ab761936cdae9ffb7228 (patch) | |
| tree | 91908d828af2d2c6e4bd96374d932cec73aaf01d /src/backend/utils/adt/ascii.c | |
| parent | 8e80dbb849cc63f6652a5fc645fa4d1e136c3c4c (diff) | |
| download | postgresql-ed7baeaf4df676489106ab761936cdae9ffb7228.tar.gz postgresql-ed7baeaf4df676489106ab761936cdae9ffb7228.zip | |
Remove #ifdef MULTIBYTE per hackers list discussion.
Diffstat (limited to 'src/backend/utils/adt/ascii.c')
| -rw-r--r-- | src/backend/utils/adt/ascii.c | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c index a62672a5e53..0a2820721dc 100644 --- a/src/backend/utils/adt/ascii.c +++ b/src/backend/utils/adt/ascii.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * ascii.c * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.12 2001/11/05 17:46:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.13 2002/08/29 07:22:26 ishii Exp $ * * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * @@ -18,46 +18,6 @@ #include "mb/pg_wchar.h" #include "utils/ascii.h" -/* ---------- - * even if MULTIBYTE is not enabled, these functions must exist - * since pg_proc.h has references to them. - * ---------- - */ -#ifndef MULTIBYTE - -static void multibyte_error(void); - -static void -multibyte_error(void) -{ - elog(ERROR, "Multi-byte support is not enabled"); -} - -Datum -to_ascii_encname(PG_FUNCTION_ARGS) -{ - multibyte_error(); - return 0; /* keep compiler quiet */ -} - -Datum -to_ascii_enc(PG_FUNCTION_ARGS) -{ - multibyte_error(); - return 0; /* keep compiler quiet */ -} - -Datum -to_ascii_default(PG_FUNCTION_ARGS) -{ - multibyte_error(); - return 0; /* keep compiler quiet */ -} - - -#else /* with MULTIBYTE */ - - static text *encode_to_ascii(text *data, int enc); /* ---------- @@ -190,5 +150,3 @@ to_ascii_default(PG_FUNCTION_ARGS) ) ); } - -#endif /* MULTIBYTE */ |