APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1489343455 0 # Sun Mar 12 18:30:55 2017 +0000 # Node ID b39892b2cd48fdd5f2ff4e6c9f87baaa7dd39187 # Parent 7053230a0057848e0491c2be03ffa64ba38b89d0 Revert to the pre-merge description of the no-conversion coding system type. src/ChangeLog addition: 2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; * file-coding.c (coding_system_type_create): Revert to the pre-merge description of the no-conversion coding system type, the approach I had taken on the unicode-internal side leads to dumping problems with the C++ build. Thank you for the buildbot reports, Matsl! diff -r 7053230a0057 -r b39892b2cd48 src/ChangeLog --- a/src/ChangeLog Sun Mar 12 13:16:09 2017 +0000 +++ b/src/ChangeLog Sun Mar 12 18:30:55 2017 +0000 ＠＠ -1,3 +1,12 ＠＠ +2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * file-coding.c: + * file-coding.c (coding_system_type_create): + Revert to the pre-merge description of the no-conversion coding + system type, the approach I had taken on the unicode-internal side + leads to dumping problems with the C++ build. + Thank you for the buildbot reports, Matsl! + 2017-03-12 Aidan Kehoe <kehoea(a)parhasard.net&gt; Make some small changes to placate the buildbot. diff -r 7053230a0057 -r b39892b2cd48 src/file-coding.c --- a/src/file-coding.c Sun Mar 12 13:16:09 2017 +0000 +++ b/src/file-coding.c Sun Mar 12 18:30:55 2017 +0000 ＠＠ -3863,21 +3863,7 ＠＠ Charcount characters_seen; }; -struct no_conversion_coding_system -{ -}; - -static const struct memory_description - no_conversion_coding_system_description[] = { - { XD_END } -}; - -static const struct memory_description - no_conversion_coding_stream_description[] = { - { XD_END } -}; - -DEFINE_CODING_SYSTEM_TYPE_WITH_DATA (no_conversion); +DEFINE_CODING_SYSTEM_TYPE (no_conversion); /* This is used when reading in "binary" files -- i.e. files that may contain all 256 possible byte values and that are not to be ＠＠ -5827,8 +5813,13 ＠＠ dump_add_opaque_int (&coding_detector_count); dump_add_opaque_int (&coding_detector_category_count); - INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA (no_conversion, - "no-conversion-coding-system-p"); + INITIALIZE_CODING_SYSTEM_TYPE (no_conversion, + "no-conversion-coding-system-p"); + /* This is the only coding system type that has coding_stream info but no + coding_system info, which is why we're not using + INITIALIZE_CODING_SYSTEM_TYPE_WITH_DATA. */ + no_conversion_coding_system_methods->stream_data_size = + sizeof (struct no_conversion_coding_stream); CODING_SYSTEM_HAS_METHOD (no_conversion, convert); CODING_SYSTEM_HAS_METHOD (no_conversion, character_tell); -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)