diff options
| author | Manolo Gouy <Manolo> | 2010-12-15 14:07:43 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-12-15 14:07:43 +0000 |
| commit | 6e3bb7b24deb332eb33d96d071bb0d6ec377ee8e (patch) | |
| tree | fbc5bb3290f1a27de185da290ec8b977dfa404ba /src/xutf8/lcUniConv/cp936ext.h | |
| parent | ff1d7b6dad3d6fb3301a1d5b55a2febc2d3bba49 (diff) | |
Fix STR # 2481: removed compilation warnings.
Files utf8Input.c and utf8Wrap.c (via ucs2fontmap.c that's included)
need a different half of each of these input files. What is in the other
half is unused and thus triggers a compilation warning.
This has been fixed by adding #define NEED_TOWC in utf8Input.c
and #define NEED_TOMB in ucs2fontmap.c and by bracketting the first half
of these include files by #ifdef NEED_TOWC/#endif and the second half
by #ifdef NEED_TOMB/#endif.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8038 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/xutf8/lcUniConv/cp936ext.h')
| -rw-r--r-- | src/xutf8/lcUniConv/cp936ext.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/xutf8/lcUniConv/cp936ext.h b/src/xutf8/lcUniConv/cp936ext.h index 9e26d663a..f1e2292db 100644 --- a/src/xutf8/lcUniConv/cp936ext.h +++ b/src/xutf8/lcUniConv/cp936ext.h @@ -28,22 +28,27 @@ #if !defined(WIN32) && !defined(__APPLE__) #ifndef CP936 +#ifdef NEED_TOWC static int cp936ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) { return 0; } +#endif // NEED_TOWC +#ifdef NEED_TOMB static int cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { return 0; } +#endif // NEED_TOMB #else /* * CP936EXT */ +#ifdef NEED_TOWC static const unsigned short cp936ext_2uni_page81[23766] = { /* 0x81 */ @@ -3201,6 +3206,9 @@ cp936ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif // NEED_TOWC + +#ifdef NEED_TOMB static const unsigned short cp936ext_page0014[208] = { 0x0000, 0x0000, 0x0000, 0x0000, 0xa1e8, 0x0000, 0x0000, 0xa1ec, /*0xa0-0xa7*/ @@ -6240,6 +6248,7 @@ cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_TOOSMALL; } +#endif // NEED_TOMB #endif // CP936 |