From 6525b6f760ccd9612c9546b0313ab1c7e4af5e66 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sat, 10 Sep 2022 19:15:49 +0200 Subject: Remove get_actual_encoding() and the dynamic endian detection for dummy UTF-16/UTF-32 * And simplify callers of get_actual_encoding(). * See [Feature #18949]. * See https://github.com/ruby/ruby/pull/6322#issuecomment-1242758474 --- enc/encdb.c | 2 +- enc/utf_16_32.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'enc') diff --git a/enc/encdb.c b/enc/encdb.c index a1936df804..8247e9ff6a 100644 --- a/enc/encdb.c +++ b/enc/encdb.c @@ -17,7 +17,7 @@ #define ENC_DEFINE(name) rb_encdb_declare(name) #define ENC_SET_BASE(name, orig) rb_enc_set_base((name), (orig)) #define ENC_SET_DUMMY(name, orig) rb_enc_set_dummy(name) -#define ENC_DUMMY_UNICODE(name) rb_encdb_set_unicode(rb_enc_set_dummy(ENC_REPLICATE((name), name "BE"))) +#define ENC_DUMMY_UNICODE(name) ENC_DUMMY(name) void Init_encdb(void) diff --git a/enc/utf_16_32.h b/enc/utf_16_32.h index 9f9216d8ff..4d669019bf 100644 --- a/enc/utf_16_32.h +++ b/enc/utf_16_32.h @@ -1,5 +1,5 @@ #include "regenc.h" /* dummy for unsupported, stateful encoding */ -#define ENC_DUMMY_UNICODE(name) ENC_REPLICATE(name, name "BE") +#define ENC_DUMMY_UNICODE(name) ENC_DUMMY(name) ENC_DUMMY_UNICODE("UTF-16"); ENC_DUMMY_UNICODE("UTF-32"); -- cgit v1.2.1