Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc6b2838

Browse files
committed
Fix typo. Remove #ifdef MULTIBYTE
1 parent06ad580 commitc6b2838

File tree

1 file changed

+25
-35
lines changed

1 file changed

+25
-35
lines changed

‎src/include/mb/pg_wchar.h‎

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: pg_wchar.h,v 1.40 2002/07/18 02:02:30 ishii Exp $ */
1+
/* $Id: pg_wchar.h,v 1.41 2002/07/29 08:04:55 ishii Exp $ */
22

33
#ifndefPG_WCHAR_H
44
#definePG_WCHAR_H
@@ -15,13 +15,8 @@
1515
/*
1616
* The pg_wchar
1717
*/
18-
#ifdefMULTIBYTE
1918
typedefunsignedintpg_wchar;
2019

21-
#else
22-
#definepg_wchar char
23-
#endif
24-
2520
/*
2621
* various definitions for EUC
2722
*/
@@ -197,9 +192,6 @@ typedef enum pg_enc
197192
#definePG_ENCODING_BE_LAST PG_ISO_8859_8
198193
#definePG_ENCODING_FE_LAST PG_WIN1256
199194

200-
201-
#ifdefMULTIBYTE
202-
203195
/*
204196
* Please use these tests before access to pg_encconv_tbl[]
205197
* or to other places...
@@ -284,29 +276,29 @@ typedef struct
284276
unsignedintutf;/* UTF-8 */
285277
}pg_local_to_utf;
286278

287-
externintpg_mb2wchar(constunsignedchar*,pg_wchar*);
288-
externintpg_mb2wchar_with_len(constunsignedchar*,pg_wchar*,int);
289-
externintpg_char_and_wchar_strcmp(constchar*,constpg_wchar*);
290-
externintpg_wchar_strncmp(constpg_wchar*,constpg_wchar*,size_t);
291-
externintpg_char_and_wchar_strncmp(constchar*,constpg_wchar*,size_t);
292-
externsize_tpg_wchar_strlen(constpg_wchar*);
293-
externintpg_mblen(constunsignedchar*);
294-
externintpg_encoding_mblen(int,constunsignedchar*);
295-
externintpg_mule_mblen(constunsignedchar*);
296-
externintpg_mic_mblen(constunsignedchar*);
297-
externintpg_mbstrlen(constunsignedchar*);
298-
externintpg_mbstrlen_with_len(constunsignedchar*,int);
299-
externintpg_mbcliplen(constunsignedchar*,int,int);
300-
externintpg_mbcharcliplen(constunsignedchar*,int,int);
301-
externintpg_encoding_max_length(int);
279+
externintpg_mb2wchar(constunsignedchar*from,pg_wchar*to);
280+
externintpg_mb2wchar_with_len(constunsignedchar*from,pg_wchar*to,intlen);
281+
externintpg_char_and_wchar_strcmp(constchar*s1,constpg_wchar*s2);
282+
externintpg_wchar_strncmp(constpg_wchar*s1,constpg_wchar*s2,size_tn);
283+
externintpg_char_and_wchar_strncmp(constchar*s1,constpg_wchar*s2,size_tn);
284+
externsize_tpg_wchar_strlen(constpg_wchar*wstr);
285+
externintpg_mblen(constunsignedchar*mbstr);
286+
externintpg_encoding_mblen(intencoding,constunsignedchar*mbstr);
287+
externintpg_mule_mblen(constunsignedchar*mbstr);
288+
externintpg_mic_mblen(constunsignedchar*mbstr);
289+
externintpg_mbstrlen(constunsignedchar*mbstr);
290+
externintpg_mbstrlen_with_len(constunsignedchar*mbstr,intlen);
291+
externintpg_mbcliplen(constunsignedchar*mbstr,intlen,intlimit);
292+
externintpg_mbcharcliplen(constunsignedchar*mbstr,intlen,intimit);
293+
externintpg_encoding_max_length(intencoding);
302294
externintpg_database_encoding_max_length(void);
303295

304296
externvoidSetDefaultClientEncoding(void);
305297
externintSetClientEncoding(intencoding,booldoit);
306298
externintpg_get_client_encoding(void);
307299
externconstchar*pg_get_client_encoding_name(void);
308300

309-
externvoidSetDatabaseEncoding(int);
301+
externvoidSetDatabaseEncoding(intencoding);
310302
externintGetDatabaseEncoding(void);
311303
externconstchar*GetDatabaseEncodingName(void);
312304

@@ -318,24 +310,22 @@ extern unsigned char *pg_do_encoding_conversion(unsigned char *src, int len,
318310
intsrc_encoding,
319311
intdest_encoding);
320312

321-
externunsignedchar*pg_client_to_server(unsignedchar*,int);
322-
externunsignedchar*pg_server_to_client(unsignedchar*,int);
313+
externunsignedchar*pg_client_to_server(unsignedchar*s,intlen);
314+
externunsignedchar*pg_server_to_client(unsignedchar*s,intlen);
323315

324-
externunsigned shortBIG5toCNS(unsigned short,unsignedchar*);
325-
externunsigned shortCNStoBIG5(unsigned short,unsignedchar);
316+
externunsigned shortBIG5toCNS(unsigned shortbig5,unsignedchar*lc);
317+
externunsigned shortCNStoBIG5(unsigned shortcns,unsignedcharlc);
326318

327319
externvoidLocalToUtf(unsignedchar*iso,unsignedchar*utf,
328320
pg_local_to_utf*map,intsize,intencoding,intlen);
329321

330322
externvoidUtfToLocal(unsignedchar*utf,unsignedchar*iso,
331323
pg_utf_to_local*map,intsize,intlen);
332324

333-
char*pg_verifymbstr(constunsignedchar*,int);
334-
335-
voidpg_ascii2mic(unsignedchar*src,unsignedchar*dest,intlen);
336-
voidpg_mic2ascii(unsignedchar*src,unsignedchar*dest,intlen);
337-
voidpg_print_bogus_char(unsignedchar**mic,unsignedchar**p);
325+
externchar*pg_verifymbstr(constunsignedchar*mbstr,intlen);
338326

339-
#endif/* MULTIBYTE */
327+
externvoidpg_ascii2mic(unsignedchar*src,unsignedchar*dest,intlen);
328+
externvoidpg_mic2ascii(unsignedchar*src,unsignedchar*dest,intlen);
329+
externvoidpg_print_bogus_char(unsignedchar**mic,unsignedchar**p);
340330

341331
#endif/* PG_WCHAR_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp