summaryrefslogtreecommitdiff
path: root/src/include/utils
diff options
context:
space:
mode:
authorTatsuo Ishii2002-08-29 07:22:30 +0000
committerTatsuo Ishii2002-08-29 07:22:30 +0000
commited7baeaf4df676489106ab761936cdae9ffb7228 (patch)
tree91908d828af2d2c6e4bd96374d932cec73aaf01d /src/include/utils
parent8e80dbb849cc63f6652a5fc645fa4d1e136c3c4c (diff)
Remove #ifdef MULTIBYTE per hackers list discussion.
Diffstat (limited to 'src/include/utils')
-rw-r--r--src/include/utils/ascii.h5
-rw-r--r--src/include/utils/builtins.h6
2 files changed, 3 insertions, 8 deletions
diff --git a/src/include/utils/ascii.h b/src/include/utils/ascii.h
index 068cf61a6c9..a2a983f2428 100644
--- a/src/include/utils/ascii.h
+++ b/src/include/utils/ascii.h
@@ -2,7 +2,7 @@
/* -----------------------------------------------------------------------
* ascii.h
*
- * $Id: ascii.h,v 1.8 2001/11/05 17:46:36 momjian Exp $
+ * $Id: ascii.h,v 1.9 2002/08/29 07:22:29 ishii Exp $
*
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
*
@@ -18,10 +18,7 @@ extern Datum to_ascii_encname(PG_FUNCTION_ARGS);
extern Datum to_ascii_enc(PG_FUNCTION_ARGS);
extern Datum to_ascii_default(PG_FUNCTION_ARGS);
-#ifdef MULTIBYTE
-
extern char *pg_to_ascii(unsigned char *src, unsigned char *src_end,
unsigned char *desc, int enc);
-#endif /* MULTIBYTE */
#endif /* _ASCII_H_ */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 6f33ee4e42c..33467c2ff03 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: builtins.h,v 1.196 2002/08/29 00:17:06 tgl Exp $
+ * $Id: builtins.h,v 1.197 2002/08/29 07:22:29 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@@ -661,9 +661,7 @@ extern Datum RI_FKey_setnull_upd(PG_FUNCTION_ARGS);
extern Datum RI_FKey_setdefault_del(PG_FUNCTION_ARGS);
extern Datum RI_FKey_setdefault_upd(PG_FUNCTION_ARGS);
-/* even if MULTIBYTE is not enabled, these functions are necessary
- * since pg_proc.h has references to them.
- */
+/* multibyte support functions */
extern Datum getdatabaseencoding(PG_FUNCTION_ARGS);
extern Datum database_character_set(PG_FUNCTION_ARGS);
extern Datum pg_client_encoding(PG_FUNCTION_ARGS);