From 052ce19a3589e5824edc5f6c1dde8a5061d12da0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 15 Oct 2022 19:59:51 +0200 Subject: [PATCH] gen-uni-tables: Temporarily revert last change. * lib/gen-uni-tables.c: Include , unless the C compiler advertises compliance to ISO C 23. --- ChangeLog | 6 ++++ lib/gen-uni-tables.c | 77 +++++++++++++++++++++++--------------------- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16156b7cdd..1719275585 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2022-10-15 Bruno Haible + + gen-uni-tables: Temporarily revert last change. + * lib/gen-uni-tables.c: Include , unless the C compiler + advertises compliance to ISO C 23. + 2022-10-12 Paul Eggert doc: improve intprops doc diff --git a/lib/gen-uni-tables.c b/lib/gen-uni-tables.c index 2c5dbd462c..622b51dfd5 100644 --- a/lib/gen-uni-tables.c +++ b/lib/gen-uni-tables.c @@ -18,25 +18,28 @@ along with this program. If not, see . */ /* Usage example: - $ gen-uni-tables /usr/local/share/www.unicode.org/Public/14.0.0/ucd/UnicodeData.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/PropList.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/DerivedCoreProperties.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/emoji/emoji-data.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/ArabicShaping.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/Scripts.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/Blocks.txt \ + $ gen-uni-tables /usr/local/share/www.unicode.org/Public/15.0.0/ucd/UnicodeData.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/PropList.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/DerivedCoreProperties.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/emoji/emoji-data.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/ArabicShaping.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/Scripts.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/Blocks.txt \ /usr/local/share/www.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/EastAsianWidth.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/LineBreak.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/auxiliary/WordBreakProperty.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/CompositionExclusions.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/SpecialCasing.txt \ - /usr/local/share/www.unicode.org/Public/14.0.0/ucd/CaseFolding.txt \ - 14.0.0 + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/EastAsianWidth.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/LineBreak.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/auxiliary/WordBreakProperty.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/CompositionExclusions.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/SpecialCasing.txt \ + /usr/local/share/www.unicode.org/Public/15.0.0/ucd/CaseFolding.txt \ + 15.0.0 */ #include +#if __STDC_VERSION__ < 202311L +# include +#endif #include #include #include @@ -11268,32 +11271,32 @@ main (int argc, char * argv[]) * compile-command: "\ * gcc -O -Wall gen-uni-tables.c -Iunictype -o gen-uni-tables && \\ * ./gen-uni-tables \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/UnicodeData.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/PropList.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/DerivedCoreProperties.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/emoji/emoji-data.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/ArabicShaping.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/Scripts.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/Blocks.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/UnicodeData.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/PropList.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/DerivedCoreProperties.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/emoji/emoji-data.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/ArabicShaping.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/Scripts.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/Blocks.txt \\ * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/3.0.1/PropList-3.0.1.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/EastAsianWidth.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/LineBreak.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/auxiliary/WordBreakProperty.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/CompositionExclusions.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/SpecialCasing.txt \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/CaseFolding.txt \\ - * 14.0.0 \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/EastAsianWidth.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/LineBreak.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/auxiliary/WordBreakProperty.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/auxiliary/GraphemeBreakProperty.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/CompositionExclusions.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/SpecialCasing.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/CaseFolding.txt \\ + * 15.0.0 \\ * && diff unilbrk/lbrkprop_org.txt unilbrk/lbrkprop.txt \\ * && diff uniwbrk/wbrkprop_org.txt uniwbrk/wbrkprop.txt \\ * && clisp -C uniname/gen-uninames.lisp \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/UnicodeData.txt \\ + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/UnicodeData.txt \\ * uniname/uninames.h \\ - * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/NameAliases.txt \\ - * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/NameAliases.txt ../tests/uniname/NameAliases.txt \\ - * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/UnicodeData.txt ../tests/uniname/UnicodeData.txt \\ - * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/NormalizationTest.txt ../tests/uninorm/NormalizationTest.txt \\ - * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/auxiliary/GraphemeBreakTest.txt ../tests/unigbrk/GraphemeBreakTest.txt \\ - * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/14.0.0/ucd/auxiliary/WordBreakTest.txt ../tests/uniwbrk/WordBreakTest.txt" + * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/NameAliases.txt \\ + * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/NameAliases.txt ../tests/uniname/NameAliases.txt \\ + * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/UnicodeData.txt ../tests/uniname/UnicodeData.txt \\ + * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/NormalizationTest.txt ../tests/uninorm/NormalizationTest.txt \\ + * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/auxiliary/GraphemeBreakTest.txt ../tests/unigbrk/GraphemeBreakTest.txt \\ + * && cp /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.0.0/ucd/auxiliary/WordBreakTest.txt ../tests/uniwbrk/WordBreakTest.txt" * End: */ -- 2.39.5