Skip to content

Commit af630fd

Browse files
committed
Remove translit and 'LIBICONV_PLUG'.
修改: CMakeLists.txt 修改: ChangeLog 修改: Makefile.devel 修改: README 修改: include/cppp/reiconv.hpp.in 修改: lib/converters.h 删除: lib/generated/translit.h 删除: lib/gentranslit.c 修改: lib/iconv.cpp 修改: lib/iconv_open1.h 修改: lib/iconv_open2.h 修改: lib/loop_unicode.h 修改: lib/loop_wchar.h 删除: lib/translit.def 修改: tests/Makefile.in 修改: tests/check-ebcdic 删除: tests/check-translit 删除: tests/check-translit.bat
1 parent 285a2b9 commit af630fd

18 files changed

+4
-9812
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ configure_file("${srcdir}/include/cppp/reiconv.hpp.in" "${output_includedir}/cpp
2424
# Generate header file for install
2525
if(WIN32)
2626
set(DLL_VARIABLE "__declspec(dllimport)")
27-
elseif(HAVE_VISIBILITY)
28-
set(DLL_VARIABLE "__attribute__((__visibility__(\"default\")))")
2927
else()
3028
set(DLL_VARIABLE "")
3129
endif()

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
Add CMake support.
1212
Move generated file into 'lib/generated'.
1313
Move cppp-reiconv to a C++ library.
14+
Remove translit support.
1415

1516
2023-06-29 Bruno Haible <bruno@clisp.org>
1617

Makefile.devel

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ all : lib/generated \
2121
lib/generated/aliases_dos.h \
2222
lib/generated/aliases_zos.h \
2323
lib/generated/aliases_extra.h \
24-
lib/generated/flags.h lib/generated/translit.h
24+
lib/generated/flags.h
2525

2626
lib/generated :
2727
$(MKDIR) lib/generated
@@ -117,12 +117,6 @@ lib/generated/flags.h : lib/encodings.def lib/encodings_aix.def lib/encodings_os
117117
./genflags > lib/generated/flags.h
118118
$(RM) genflags
119119

120-
121-
lib/generated/translit.h : lib/translit.def lib/gentranslit.c
122-
$(CC) $(CFLAGS) lib/gentranslit.c -o gentranslit
123-
./gentranslit < lib/translit.def > lib/generated/translit.h
124-
$(RM) gentranslit
125-
126120
clean :
127121
rm -f lib/generated/aliases.gperf lib/generated/aliases_sysaix.gperf lib/generated/aliases_syshpux.gperf lib/generated/aliases_sysosf1.gperf lib/generated/aliases_syssolaris.gperf
128122
rm -f lib/generated/aliases.h lib/generated/aliases_sysaix.h lib/generated/aliases_syshpux.h lib/generated/aliases_sysosf1.h lib/generated/aliases_syssolaris.h
@@ -139,4 +133,3 @@ clean :
139133
rm -f lib/generated/canonical_extra.h
140134
rm -f lib/generated/canonical_local.h lib/generated/canonical_local_sysaix.h lib/generated/canonical_local_syshpux.h lib/generated/canonical_local_sysosf1.h lib/generated/canonical_local_syssolaris.h
141135
rm -f lib/generated/flags.h
142-
rm -f lib/generated/translit.h

README

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ support for a few extra encodings:
9494
It can convert from any of these encodings to any other, through Unicode
9595
conversion.
9696

97-
It has also some limited support for transliteration, i.e. when a character
98-
cannot be represented in the target character set, it can be approximated
99-
through one or several similarly looking characters. Transliteration is
100-
activated when "//TRANSLIT" is appended to the target encoding name.
101-
10297
libiconv is for you if your application needs to support multiple character
10398
encodings, but that support lacks from your system.
10499

include/cppp/reiconv.hpp.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ extern "C++"
144144

145145
/* Requests for iconvctl. */
146146
#define ICONV_TRIVIALP 0 /* int *argument */
147-
#define ICONV_GET_TRANSLITERATE 1 /* int *argument */
148-
#define ICONV_SET_TRANSLITERATE 2 /* const int *argument */
149147
#define ICONV_GET_DISCARD_ILSEQ 3 /* int *argument */
150148
#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */
151149
#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */

lib/converters.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,9 @@ struct conv_struct {
107107
unsigned int osurface;
108108
state_t ostate;
109109
/* Operation flags */
110-
int transliterate;
111110
int discard_ilseq;
112-
#ifndef LIBICONV_PLUG
113111
struct iconv_fallbacks fallbacks;
114112
struct iconv_hooks hooks;
115-
#endif
116113
};
117114

118115
/*

0 commit comments

Comments
 (0)