comparison src/file-coding.h @ 4569:80e0588fb42f

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 28 Dec 2008 14:55:02 +0000
parents 726060ee587c 1d74a1d115ee
children 257b468bf2ca
comparison
equal deleted inserted replaced
4537:7ca6d57ce12d 4569:80e0588fb42f
581 #define CODING_SYSTEM_EOL_CR(codesys) ((codesys)->eol[EOL_CR]) 581 #define CODING_SYSTEM_EOL_CR(codesys) ((codesys)->eol[EOL_CR])
582 #define CODING_SYSTEM_TEXT_FILE_WRAPPER(codesys) ((codesys)->text_file_wrapper) 582 #define CODING_SYSTEM_TEXT_FILE_WRAPPER(codesys) ((codesys)->text_file_wrapper)
583 #define CODING_SYSTEM_AUTO_EOL_WRAPPER(codesys) ((codesys)->auto_eol_wrapper) 583 #define CODING_SYSTEM_AUTO_EOL_WRAPPER(codesys) ((codesys)->auto_eol_wrapper)
584 #define CODING_SYSTEM_SUBSIDIARY_PARENT(codesys) ((codesys)->subsidiary_parent) 584 #define CODING_SYSTEM_SUBSIDIARY_PARENT(codesys) ((codesys)->subsidiary_parent)
585 #define CODING_SYSTEM_CANONICAL(codesys) ((codesys)->canonical) 585 #define CODING_SYSTEM_CANONICAL(codesys) ((codesys)->canonical)
586 #define CODING_SYSTEM_SAFE_CHARSETS(codesys) ((codesys)->safe_charsets)
587 #define CODING_SYSTEM_SAFE_CHARS(codesys) ((codesys)->safe_chars)
586 588
587 #define CODING_SYSTEM_CHAIN_CHAIN(codesys) \ 589 #define CODING_SYSTEM_CHAIN_CHAIN(codesys) \
588 (CODING_SYSTEM_TYPE_DATA (codesys, chain)->chain) 590 (CODING_SYSTEM_TYPE_DATA (codesys, chain)->chain)
589 #define CODING_SYSTEM_CHAIN_COUNT(codesys) \ 591 #define CODING_SYSTEM_CHAIN_COUNT(codesys) \
590 (CODING_SYSTEM_TYPE_DATA (codesys, chain)->count) 592 (CODING_SYSTEM_TYPE_DATA (codesys, chain)->count)
621 CODING_SYSTEM_AUTO_EOL_WRAPPER (XCODING_SYSTEM (codesys)) 623 CODING_SYSTEM_AUTO_EOL_WRAPPER (XCODING_SYSTEM (codesys))
622 #define XCODING_SYSTEM_SUBSIDIARY_PARENT(codesys) \ 624 #define XCODING_SYSTEM_SUBSIDIARY_PARENT(codesys) \
623 CODING_SYSTEM_SUBSIDIARY_PARENT (XCODING_SYSTEM (codesys)) 625 CODING_SYSTEM_SUBSIDIARY_PARENT (XCODING_SYSTEM (codesys))
624 #define XCODING_SYSTEM_CANONICAL(codesys) \ 626 #define XCODING_SYSTEM_CANONICAL(codesys) \
625 CODING_SYSTEM_CANONICAL (XCODING_SYSTEM (codesys)) 627 CODING_SYSTEM_CANONICAL (XCODING_SYSTEM (codesys))
628 #define XCODING_SYSTEM_SAFE_CHARSETS(codesys) \
629 CODING_SYSTEM_SAFE_CHARSETS (XCODING_SYSTEM (codesys))
630 #define XCODING_SYSTEM_SAFE_CHARS(codesys) \
631 CODING_SYSTEM_SAFE_CHARS (XCODING_SYSTEM (codesys))
626 632
627 #define XCODING_SYSTEM_CHAIN_CHAIN(codesys) \ 633 #define XCODING_SYSTEM_CHAIN_CHAIN(codesys) \
628 CODING_SYSTEM_CHAIN_CHAIN (XCODING_SYSTEM (codesys)) 634 CODING_SYSTEM_CHAIN_CHAIN (XCODING_SYSTEM (codesys))
629 #define XCODING_SYSTEM_CHAIN_COUNT(codesys) \ 635 #define XCODING_SYSTEM_CHAIN_COUNT(codesys) \
630 CODING_SYSTEM_CHAIN_COUNT (XCODING_SYSTEM (codesys)) 636 CODING_SYSTEM_CHAIN_COUNT (XCODING_SYSTEM (codesys))