From: Bruno Haible Date: Fri, 27 Dec 2024 22:43:23 +0000 (+0100) Subject: Rename module unitypes to unitypes-h. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05bd958770e396ddedd26c5408f187ff0d448c63;p=thirdparty%2Fgnulib.git Rename module unitypes to unitypes-h. * modules/unitypes-h: Renamed from modules/unitypes. * doc/libunistring.texi: Update. * modules/* (Depends-on): Update. * modules/unitypes: New file. --- diff --git a/ChangeLog b/ChangeLog index d672709aa8..b6ab442adf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-12-27 Bruno Haible + + Rename module unitypes to unitypes-h. + * modules/unitypes-h: Renamed from modules/unitypes. + * doc/libunistring.texi: Update. + * modules/* (Depends-on): Update. + * modules/unitypes: New file. + 2024-12-27 Bruno Haible Rename module unistd to unistd-h. diff --git a/doc/libunistring.texi b/doc/libunistring.texi index 226ebb2d16..8984a69a61 100644 --- a/doc/libunistring.texi +++ b/doc/libunistring.texi @@ -83,8 +83,8 @@ GNU libunistring documentation @node modules @subsubsection Declarations in -@mindex unitypes -The @code{} header file is provided by the module @code{unitypes}. +@mindex unitypes-h +The @code{} header file is provided by the module @code{unitypes-h}. @node modules @subsubsection Declarations in diff --git a/modules/unicase/base b/modules/unicase/base index 230dbe6428..0f41ce781c 100644 --- a/modules/unicase/base +++ b/modules/unicase/base @@ -8,7 +8,7 @@ m4/unicase_h.m4 Depends-on: gen-header -unitypes +unitypes-h uninorm/base stdbool-h diff --git a/modules/unicase/cased b/modules/unicase/cased index d30b7e70fa..820b77cf9c 100644 --- a/modules/unicase/cased +++ b/modules/unicase/cased @@ -8,7 +8,7 @@ lib/unicase/cased.h lib/unictype/bitmap.h Depends-on: -unitypes +unitypes-h stdbool-h configure.ac: diff --git a/modules/unicase/ignorable b/modules/unicase/ignorable index 4a0b29cddf..f43556d2bd 100644 --- a/modules/unicase/ignorable +++ b/modules/unicase/ignorable @@ -8,7 +8,7 @@ lib/unicase/ignorable.h lib/unictype/bitmap.h Depends-on: -unitypes +unitypes-h stdbool-h configure.ac: diff --git a/modules/unicase/u16-is-invariant b/modules/unicase/u16-is-invariant index b4cf576b63..872c710b7b 100644 --- a/modules/unicase/u16-is-invariant +++ b/modules/unicase/u16-is-invariant @@ -7,7 +7,7 @@ lib/unicase/invariant.h lib/unicase/u-is-invariant.h Depends-on: -unitypes +unitypes-h uninorm/base uninorm/u16-normalize uninorm/nfd diff --git a/modules/unicase/u32-is-invariant b/modules/unicase/u32-is-invariant index 4befb5ceec..6a6467ba16 100644 --- a/modules/unicase/u32-is-invariant +++ b/modules/unicase/u32-is-invariant @@ -7,7 +7,7 @@ lib/unicase/invariant.h lib/unicase/u-is-invariant.h Depends-on: -unitypes +unitypes-h uninorm/base uninorm/u32-normalize uninorm/nfd diff --git a/modules/unicase/u8-is-invariant b/modules/unicase/u8-is-invariant index 6cdd4639f2..87f6909a78 100644 --- a/modules/unicase/u8-is-invariant +++ b/modules/unicase/u8-is-invariant @@ -7,7 +7,7 @@ lib/unicase/invariant.h lib/unicase/u-is-invariant.h Depends-on: -unitypes +unitypes-h uninorm/base uninorm/u8-normalize uninorm/nfd diff --git a/modules/uniconv/base b/modules/uniconv/base index a2038a6a7b..00342935de 100644 --- a/modules/uniconv/base +++ b/modules/uniconv/base @@ -11,7 +11,7 @@ m4/libunistring-base.m4 Depends-on: gen-header stdbool-h -unitypes +unitypes-h configure.ac: gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniconv.h]) diff --git a/modules/unictype/base b/modules/unictype/base index a060ab392a..5de097478d 100644 --- a/modules/unictype/base +++ b/modules/unictype/base @@ -8,7 +8,7 @@ m4/unictype_h.m4 Depends-on: gen-header -unitypes +unitypes-h stdbool-h configure.ac: diff --git a/modules/unigbrk/base b/modules/unigbrk/base index 30dff8f04b..08a82e90a9 100644 --- a/modules/unigbrk/base +++ b/modules/unigbrk/base @@ -7,7 +7,7 @@ m4/libunistring-base.m4 Depends-on: gen-header -unitypes +unitypes-h stdbool-h configure.ac: diff --git a/modules/unilbrk/base b/modules/unilbrk/base index 94b4471919..1d1dec0106 100644 --- a/modules/unilbrk/base +++ b/modules/unilbrk/base @@ -7,7 +7,7 @@ m4/libunistring-base.m4 Depends-on: gen-header -unitypes +unitypes-h localcharset stdbool-h diff --git a/modules/uniname/base b/modules/uniname/base index f6bac4ebdc..9e7979e581 100644 --- a/modules/uniname/base +++ b/modules/uniname/base @@ -7,7 +7,7 @@ m4/libunistring-base.m4 Depends-on: gen-header -unitypes +unitypes-h configure.ac: gl_LIBUNISTRING_LIBHEADER([0.9.5], [uniname.h]) diff --git a/modules/uninorm/base b/modules/uninorm/base index d5b8854828..e2537a7fe2 100644 --- a/modules/uninorm/base +++ b/modules/uninorm/base @@ -8,7 +8,7 @@ m4/uninorm_h.m4 Depends-on: gen-header -unitypes +unitypes-h configure.ac: gl_LIBUNISTRING_LIBHEADER([1.2], [uninorm.h]) diff --git a/modules/uninorm/decompose-internal b/modules/uninorm/decompose-internal index 28cf341e4f..378ceb67c0 100644 --- a/modules/uninorm/decompose-internal +++ b/modules/uninorm/decompose-internal @@ -6,7 +6,7 @@ lib/uninorm/decompose-internal.h lib/uninorm/decompose-internal.c Depends-on: -unitypes +unitypes-h array-mergesort configure.ac: diff --git a/modules/unistdio/base b/modules/unistdio/base index ee27aa3ca9..16ef50f2c6 100644 --- a/modules/unistdio/base +++ b/modules/unistdio/base @@ -7,7 +7,7 @@ m4/libunistring-base.m4 Depends-on: gen-header -unitypes +unitypes-h configure.ac: gl_LIBUNISTRING_LIBHEADER([0.9.11], [unistdio.h]) diff --git a/modules/unistdio/u-printf-args b/modules/unistdio/u-printf-args index 04ad8d15dc..efed3d7a2f 100644 --- a/modules/unistdio/u-printf-args +++ b/modules/unistdio/u-printf-args @@ -14,7 +14,7 @@ m4/inttypes_h.m4 Depends-on: stdint-h limits-h -unitypes +unitypes-h wchar configure.ac: diff --git a/modules/unistr/base b/modules/unistr/base index 6aa25b14f7..ba45a898fa 100644 --- a/modules/unistr/base +++ b/modules/unistr/base @@ -7,7 +7,7 @@ m4/libunistring-base.m4 Depends-on: gen-header -unitypes +unitypes-h stdbool-h inline diff --git a/modules/unitypes b/modules/unitypes index faf0d89b6c..65073ea12d 100644 --- a/modules/unitypes +++ b/modules/unitypes @@ -1,42 +1,20 @@ Description: Base types for Unicode string functions. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'unitypes-h' instead. + Files: -lib/unitypes.in.h -m4/libunistring-base.m4 Depends-on: -gen-header -stdint-h +unitypes-h configure.ac: -gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h]) -AC_PROG_MKDIR_P - -AH_VERBATIM([unitypes_restrict], [ -/* This definition is a duplicate of the one in unitypes.h. - It is here so that we can cope with an older version of unitypes.h - that does not contain this definition and that is pre-installed among - the public header files. */ -# if defined __restrict \ - || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \ - || __clang_major__ >= 3 -# define _UC_RESTRICT __restrict -# elif 199901L <= __STDC_VERSION__ || defined restrict -# define _UC_RESTRICT restrict -# else -# define _UC_RESTRICT -# endif -]) Makefile.am: -BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H) - -unitypes.h: unitypes.in.h -@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unitypes.in.h - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += unitypes.h unitypes.h-t Include: "unitypes.h" @@ -45,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/unitypes-h b/modules/unitypes-h new file mode 100644 index 0000000000..faf0d89b6c --- /dev/null +++ b/modules/unitypes-h @@ -0,0 +1,48 @@ +Description: +Base types for Unicode string functions. + +Files: +lib/unitypes.in.h +m4/libunistring-base.m4 + +Depends-on: +gen-header +stdint-h + +configure.ac: +gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h]) +AC_PROG_MKDIR_P + +AH_VERBATIM([unitypes_restrict], [ +/* This definition is a duplicate of the one in unitypes.h. + It is here so that we can cope with an older version of unitypes.h + that does not contain this definition and that is pre-installed among + the public header files. */ +# if defined __restrict \ + || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \ + || __clang_major__ >= 3 +# define _UC_RESTRICT __restrict +# elif 199901L <= __STDC_VERSION__ || defined restrict +# define _UC_RESTRICT restrict +# else +# define _UC_RESTRICT +# endif +]) + +Makefile.am: +BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H) + +unitypes.h: unitypes.in.h +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unitypes.in.h + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += unitypes.h unitypes.h-t + +Include: +"unitypes.h" + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/uniwbrk/base b/modules/uniwbrk/base index 556bb002cc..48b9f94708 100644 --- a/modules/uniwbrk/base +++ b/modules/uniwbrk/base @@ -7,7 +7,7 @@ m4/libunistring-base.m4 Depends-on: gen-header -unitypes +unitypes-h configure.ac: gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwbrk.h]) diff --git a/modules/uniwidth/base b/modules/uniwidth/base index 8d8615ff22..76ac75c37f 100644 --- a/modules/uniwidth/base +++ b/modules/uniwidth/base @@ -8,7 +8,7 @@ m4/libunistring-base.m4 Depends-on: gen-header -unitypes +unitypes-h configure.ac: gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h])