diff options
Diffstat (limited to 'src/include/mb/pg_wchar.h')
| -rw-r--r-- | src/include/mb/pg_wchar.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index b137da7cec4..ca8e6b15dfd 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -1,4 +1,4 @@ -/* $Id: pg_wchar.h,v 1.24 2001/02/10 02:31:28 tgl Exp $ */ +/* $Id: pg_wchar.h,v 1.25 2001/03/22 04:00:49 momjian Exp $ */ #ifndef PG_WCHAR_H #define PG_WCHAR_H @@ -8,7 +8,7 @@ #ifdef FRONTEND #undef palloc #define palloc malloc -# undef pfree +#undef pfree #define pfree free #endif @@ -38,6 +38,7 @@ #ifdef MULTIBYTE typedef unsigned int pg_wchar; + #else #define pg_wchar char #endif @@ -88,15 +89,15 @@ typedef struct * client only */ void (*to_mic) (); /* client encoding to MIC */ void (*from_mic) (); /* MIC to client encoding */ - void (*to_unicode) (); /* client encoding to UTF-8 */ - void (*from_unicode) (); /* UTF-8 to client encoding */ + void (*to_unicode) (); /* client encoding to UTF-8 */ + void (*from_unicode) (); /* UTF-8 to client encoding */ } pg_encoding_conv_tbl; extern pg_encoding_conv_tbl pg_conv_tbl[]; typedef struct { - int (*mb2wchar_with_len) (); /* convert a multi-byte + int (*mb2wchar_with_len) (); /* convert a multi-byte * string to a wchar */ int (*mblen) (); /* returns the length of a multi-byte word */ } pg_wchar_tbl; @@ -108,21 +109,21 @@ extern pg_wchar_tbl pg_wchar_table[]; */ typedef struct { - unsigned int utf; /* UTF-8 */ - unsigned int code; /* local code */ -} pg_utf_to_local; + unsigned int utf; /* UTF-8 */ + unsigned int code; /* local code */ +} pg_utf_to_local; /* * local code to UTF-8 conversion map */ typedef struct { - unsigned int code; /* local code */ - unsigned int utf; /* UTF-8 */ -} pg_local_to_utf; + unsigned int code; /* local code */ + unsigned int utf; /* UTF-8 */ +} pg_local_to_utf; -extern int pg_mb2wchar(const unsigned char *, pg_wchar *); -extern int pg_mb2wchar_with_len(const unsigned char *, pg_wchar *, int); +extern int pg_mb2wchar(const unsigned char *, pg_wchar *); +extern int pg_mb2wchar_with_len(const unsigned char *, pg_wchar *, int); extern int pg_char_and_wchar_strcmp(const char *, const pg_wchar *); extern int pg_wchar_strncmp(const pg_wchar *, const pg_wchar *, size_t); extern int pg_char_and_wchar_strncmp(const char *, const pg_wchar *, size_t); @@ -141,7 +142,7 @@ extern unsigned char *pg_client_to_server(unsigned char *, int); extern unsigned char *pg_server_to_client(unsigned char *, int); extern int pg_valid_client_encoding(const char *); extern pg_encoding_conv_tbl *pg_get_enc_ent(int); -extern int pg_utf_mblen(const unsigned char *); +extern int pg_utf_mblen(const unsigned char *); /* internally-used versions of functions. The PG_xxx forms of these * functions have fmgr-compatible interfaves. |