diff options
| author | imura <imura@FreeBSD.org> | 2005-05-24 15:38:08 +0000 |
|---|---|---|
| committer | imura <imura@FreeBSD.org> | 2005-05-24 15:38:08 +0000 |
| commit | d54bd1101b4a69648561353138ce0f7808949f51 (patch) | |
| tree | 11de4faee7eb713d70b151f8e61e0ebd951d41eb /sys/sys/iconv.h | |
| parent | a5cd5bc554f6b026dded052ccf6bc9f633b3b6de (diff) | |
| download | FreeBSD-src-d54bd1101b4a69648561353138ce0f7808949f51.zip FreeBSD-src-d54bd1101b4a69648561353138ce0f7808949f51.tar.gz | |
Fix kiconv on the 64bit plathomes.
- Correct idxp pointer to point the properly address of the
each array of the kiconv character conversion tables,
so that character conversion work properly when file
systems are mounted with kiconv options.
- The definition of ICONV_CSMAXDATALEN was also bogus
because it was defined as if all machines were 32bit
computers.
Tested on: amd64
MFC after: 1 month
Diffstat (limited to 'sys/sys/iconv.h')
| -rw-r--r-- | sys/sys/iconv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/sys/iconv.h b/sys/sys/iconv.h index 7336395..b0de40c 100644 --- a/sys/sys/iconv.h +++ b/sys/sys/iconv.h @@ -36,7 +36,8 @@ #define ICONV_CSNMAXLEN 31 /* maximum length of charset name */ #define ICONV_CNVNMAXLEN 31 /* maximum length of converter name */ -#define ICONV_CSMAXDATALEN (2048+262144) /* maximum size of data associated with cs pair */ +/* maximum size of data associated with cs pair */ +#define ICONV_CSMAXDATALEN (sizeof(caddr_t) * 0x200 + sizeof(uint32_t) * 0x200 * 0x80) #define XLAT16_ACCEPT_NULL_OUT 0x01000000 #define XLAT16_ACCEPT_NULL_IN 0x02000000 |
