From: Bruno Haible <bruno@clisp.org> Date: Fri, 27 Dec 2024 22:14:13 +0000 (+0100) Subject: Rename module inttypes to inttypes-h. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c26137915e93c6d88f01b1a3fca6edf44633216b;p=gnulib.git Rename module inttypes to inttypes-h. * modules/inttypes-h: Renamed from modules/inttypes. * modules/inttypes-h-tests: Renamed from modules/inttypes-tests. * modules/inttypes-h-c++-tests: Renamed from modules/inttypes-c++-tests. * tests/test-inttypes-h.c: Renamed from tests/test-inttypes.c. * tests/test-inttypes-h-c++.cc: Renamed from tests/test-inttypes-c++.cc. * tests/test-inttypes-h-c++2.cc: Renamed from tests/test-inttypes-c++2.cc. * doc/posix-headers/inttypes.texi: Update. * modules/* (Depends-on): Update. * modules/inttypes: New file. --- diff --git a/ChangeLog b/ChangeLog index fb72ddfb83..c118d64bac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2024-12-27 Bruno Haible <bruno@clisp.org> + + Rename module inttypes to inttypes-h. + * modules/inttypes-h: Renamed from modules/inttypes. + * modules/inttypes-h-tests: Renamed from modules/inttypes-tests. + * modules/inttypes-h-c++-tests: Renamed from modules/inttypes-c++-tests. + * tests/test-inttypes-h.c: Renamed from tests/test-inttypes.c. + * tests/test-inttypes-h-c++.cc: Renamed from tests/test-inttypes-c++.cc. + * tests/test-inttypes-h-c++2.cc: Renamed from tests/test-inttypes-c++2.cc. + * doc/posix-headers/inttypes.texi: Update. + * modules/* (Depends-on): Update. + * modules/inttypes: New file. + 2024-12-27 Bruno Haible <bruno@clisp.org> Rename module inttypes-incomplete to inttypes-h-incomplete. diff --git a/doc/posix-headers/inttypes.texi b/doc/posix-headers/inttypes.texi index 8f6043c5a3..b3ac4104be 100644 --- a/doc/posix-headers/inttypes.texi +++ b/doc/posix-headers/inttypes.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/inttypes.h.html} -Gnulib module: inttypes -@mindex inttypes +Gnulib module: inttypes-h +@mindex inttypes-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/c-stack b/modules/c-stack index 4a7d816e51..23d1da5af8 100644 --- a/modules/c-stack +++ b/modules/c-stack @@ -15,7 +15,7 @@ gettext-h gnulib-i18n idx ignore-value -inttypes +inttypes-h mempcpy raise sigsegv diff --git a/modules/intprops-tests b/modules/intprops-tests index 1a230ccde8..0a57ad9eeb 100644 --- a/modules/intprops-tests +++ b/modules/intprops-tests @@ -4,7 +4,7 @@ tests/macros.h Depends-on: assert-h -inttypes +inttypes-h stdbool configure.ac: diff --git a/modules/inttostr-tests b/modules/inttostr-tests index 48dbe509b7..f4dc08b1bb 100644 --- a/modules/inttostr-tests +++ b/modules/inttostr-tests @@ -4,7 +4,7 @@ tests/test-inttostr.c Depends-on: intprops -inttypes +inttypes-h snprintf configure.ac: diff --git a/modules/inttypes b/modules/inttypes index 074332a170..b6747f7df9 100644 --- a/modules/inttypes +++ b/modules/inttypes @@ -1,14 +1,18 @@ Description: An <inttypes.h> that nearly conforms to C99. +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'inttypes-h' instead. + Files: Depends-on: -inttypes-h-incomplete -extensions +inttypes-h configure.ac: -gl_INTTYPES_H Makefile.am: @@ -19,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/inttypes-c++-tests b/modules/inttypes-c++-tests deleted file mode 100644 index b28189f419..0000000000 --- a/modules/inttypes-c++-tests +++ /dev/null @@ -1,19 +0,0 @@ -Files: -tests/test-inttypes-c++.cc -tests/test-inttypes-c++2.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-inttypes-c++ -check_PROGRAMS += test-inttypes-c++ -test_inttypes_c___SOURCES = test-inttypes-c++.cc test-inttypes-c++2.cc -endif diff --git a/modules/inttypes-h b/modules/inttypes-h new file mode 100644 index 0000000000..074332a170 --- /dev/null +++ b/modules/inttypes-h @@ -0,0 +1,22 @@ +Description: +An <inttypes.h> that nearly conforms to C99. + +Files: + +Depends-on: +inttypes-h-incomplete +extensions + +configure.ac: +gl_INTTYPES_H + +Makefile.am: + +Include: +<inttypes.h> + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/inttypes-h-c++-tests b/modules/inttypes-h-c++-tests new file mode 100644 index 0000000000..34e0f65506 --- /dev/null +++ b/modules/inttypes-h-c++-tests @@ -0,0 +1,19 @@ +Files: +tests/test-inttypes-h-c++.cc +tests/test-inttypes-h-c++2.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-inttypes-h-c++ +check_PROGRAMS += test-inttypes-h-c++ +test_inttypes_h_c___SOURCES = test-inttypes-h-c++.cc test-inttypes-h-c++2.cc +endif diff --git a/modules/inttypes-h-tests b/modules/inttypes-h-tests new file mode 100644 index 0000000000..2fee2e262e --- /dev/null +++ b/modules/inttypes-h-tests @@ -0,0 +1,11 @@ +Files: +tests/test-inttypes-h.c + +Depends-on: +inttypes-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-inttypes-h +check_PROGRAMS += test-inttypes-h diff --git a/modules/inttypes-tests b/modules/inttypes-tests deleted file mode 100644 index 4510912be3..0000000000 --- a/modules/inttypes-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-inttypes.c - -Depends-on: -inttypes-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-inttypes -check_PROGRAMS += test-inttypes diff --git a/modules/parse-datetime b/modules/parse-datetime index 9669c2400f..56aa1237be 100644 --- a/modules/parse-datetime +++ b/modules/parse-datetime @@ -19,7 +19,7 @@ gettext-h gnulib-i18n idx intprops -inttypes +inttypes-h mktime stdckdint time-h diff --git a/modules/pthread_sigmask-tests b/modules/pthread_sigmask-tests index 508c02a16f..addcc82f91 100644 --- a/modules/pthread_sigmask-tests +++ b/modules/pthread_sigmask-tests @@ -6,7 +6,7 @@ tests/virtualbox.h tests/macros.h Depends-on: -inttypes +inttypes-h sleep pthread-thread test-xfail diff --git a/modules/sigprocmask-tests b/modules/sigprocmask-tests index 7880b64b9b..552ee38a9f 100644 --- a/modules/sigprocmask-tests +++ b/modules/sigprocmask-tests @@ -5,7 +5,7 @@ tests/virtualbox.h tests/macros.h Depends-on: -inttypes +inttypes-h sleep test-xfail diff --git a/modules/stdckdint-tests b/modules/stdckdint-tests index a4115ca44b..8f9103b603 100644 --- a/modules/stdckdint-tests +++ b/modules/stdckdint-tests @@ -5,7 +5,7 @@ tests/test-stdckdint.c Depends-on: assert-h -inttypes +inttypes-h stdbool stdckdint-c++-tests diff --git a/modules/xstrtol-tests b/modules/xstrtol-tests index c52e1611d8..3aa90b0d78 100644 --- a/modules/xstrtol-tests +++ b/modules/xstrtol-tests @@ -5,7 +5,7 @@ tests/test-xstrtol.sh tests/macros.h Depends-on: -inttypes +inttypes-h test-framework-sh xstrtol-error diff --git a/modules/xstrtoll-tests b/modules/xstrtoll-tests index d28ebca73f..16902c43a8 100644 --- a/modules/xstrtoll-tests +++ b/modules/xstrtoll-tests @@ -6,7 +6,7 @@ tests/test-xstrtoll.sh tests/macros.h Depends-on: -inttypes +inttypes-h test-framework-sh configure.ac: diff --git a/tests/test-inttypes-c++.cc b/tests/test-inttypes-c++.cc deleted file mode 100644 index 0d6784d191..0000000000 --- a/tests/test-inttypes-c++.cc +++ /dev/null @@ -1,39 +0,0 @@ -/* Test of <inttypes.h> substitute in C++ mode. - Copyright (C) 2010-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ - -/* Written by Bruno Haible <bruno@clisp.org>, 2017. */ - -#define GNULIB_NAMESPACE gnulib -#include <config.h> - -#include <inttypes.h> - -#include "signature.h" - - -#if GNULIB_TEST_STRTOIMAX -SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoimax, intmax_t, (const char *, char **, int)); -#endif - -#if GNULIB_TEST_STRTOUMAX -SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoumax, uintmax_t, (const char *, char **, int)); -#endif - - -int -main () -{ -} diff --git a/tests/test-inttypes-c++2.cc b/tests/test-inttypes-c++2.cc deleted file mode 100644 index 492025e34f..0000000000 --- a/tests/test-inttypes-c++2.cc +++ /dev/null @@ -1,24 +0,0 @@ -/* Test of <inttypes.h> substitute in C++ mode. - Copyright (C) 2019-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ - -#define GNULIB_NAMESPACE gnulib -#include <config.h> - -#if __cplusplus >= 201103 - -# include <cinttypes> - -#endif diff --git a/tests/test-inttypes-h-c++.cc b/tests/test-inttypes-h-c++.cc new file mode 100644 index 0000000000..0d6784d191 --- /dev/null +++ b/tests/test-inttypes-h-c++.cc @@ -0,0 +1,39 @@ +/* Test of <inttypes.h> substitute in C++ mode. + Copyright (C) 2010-2024 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2017. */ + +#define GNULIB_NAMESPACE gnulib +#include <config.h> + +#include <inttypes.h> + +#include "signature.h" + + +#if GNULIB_TEST_STRTOIMAX +SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoimax, intmax_t, (const char *, char **, int)); +#endif + +#if GNULIB_TEST_STRTOUMAX +SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoumax, uintmax_t, (const char *, char **, int)); +#endif + + +int +main () +{ +} diff --git a/tests/test-inttypes-h-c++2.cc b/tests/test-inttypes-h-c++2.cc new file mode 100644 index 0000000000..492025e34f --- /dev/null +++ b/tests/test-inttypes-h-c++2.cc @@ -0,0 +1,24 @@ +/* Test of <inttypes.h> substitute in C++ mode. + Copyright (C) 2019-2024 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#define GNULIB_NAMESPACE gnulib +#include <config.h> + +#if __cplusplus >= 201103 + +# include <cinttypes> + +#endif diff --git a/tests/test-inttypes-h.c b/tests/test-inttypes-h.c new file mode 100644 index 0000000000..036ca510cf --- /dev/null +++ b/tests/test-inttypes-h.c @@ -0,0 +1,116 @@ +/* Test of <inttypes.h> substitute. + Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2007. */ + +#include <config.h> + +#include <inttypes.h> + +/* Tests for macros supposed to be defined in inttypes.h. */ + +const char *k = /* implicit string concatenation */ +#ifdef INT8_MAX + PRId8 PRIi8 +#endif +#ifdef UINT8_MAX + PRIo8 PRIu8 PRIx8 PRIX8 +#endif +#ifdef INT16_MAX + PRId16 PRIi16 +#endif +#ifdef UINT16_MAX + PRIo16 PRIu16 PRIx16 PRIX16 +#endif +#ifdef INT32_MAX + PRId32 PRIi32 +#endif +#ifdef UINT32_MAX + PRIo32 PRIu32 PRIx32 PRIX32 +#endif +#ifdef INT64_MAX + PRId64 PRIi64 +#endif +#ifdef UINT64_MAX + PRIo64 PRIu64 PRIx64 PRIX64 +#endif + PRIdLEAST8 PRIiLEAST8 PRIoLEAST8 PRIuLEAST8 PRIxLEAST8 PRIXLEAST8 + PRIdLEAST16 PRIiLEAST16 PRIoLEAST16 PRIuLEAST16 PRIxLEAST16 PRIXLEAST16 + PRIdLEAST32 PRIiLEAST32 PRIoLEAST32 PRIuLEAST32 PRIxLEAST32 PRIXLEAST32 + PRIdLEAST64 PRIiLEAST64 + PRIoLEAST64 PRIuLEAST64 PRIxLEAST64 PRIXLEAST64 + PRIdFAST8 PRIiFAST8 PRIoFAST8 PRIuFAST8 PRIxFAST8 PRIXFAST8 + PRIdFAST16 PRIiFAST16 PRIoFAST16 PRIuFAST16 PRIxFAST16 PRIXFAST16 + PRIdFAST32 PRIiFAST32 PRIoFAST32 PRIuFAST32 PRIxFAST32 PRIXFAST32 + PRIdFAST64 PRIiFAST64 + PRIoFAST64 PRIuFAST64 PRIxFAST64 PRIXFAST64 + PRIdMAX PRIiMAX PRIoMAX PRIuMAX PRIxMAX PRIXMAX +#ifdef INTPTR_MAX + PRIdPTR PRIiPTR +#endif +#ifdef UINTPTR_MAX + PRIoPTR PRIuPTR PRIxPTR PRIXPTR +#endif + ; +const char *l = /* implicit string concatenation */ +#ifdef INT8_MAX + SCNd8 SCNi8 +#endif +#ifdef UINT8_MAX + SCNo8 SCNu8 SCNx8 +#endif +#ifdef INT16_MAX + SCNd16 SCNi16 +#endif +#ifdef UINT16_MAX + SCNo16 SCNu16 SCNx16 +#endif +#ifdef INT32_MAX + SCNd32 SCNi32 +#endif +#ifdef UINT32_MAX + SCNo32 SCNu32 SCNx32 +#endif +#ifdef INT64_MAX + SCNd64 SCNi64 +#endif +#ifdef UINT64_MAX + SCNo64 SCNu64 SCNx64 +#endif + SCNdLEAST8 SCNiLEAST8 SCNoLEAST8 SCNuLEAST8 SCNxLEAST8 + SCNdLEAST16 SCNiLEAST16 SCNoLEAST16 SCNuLEAST16 SCNxLEAST16 + SCNdLEAST32 SCNiLEAST32 SCNoLEAST32 SCNuLEAST32 SCNxLEAST32 + SCNdLEAST64 SCNiLEAST64 + SCNoLEAST64 SCNuLEAST64 SCNxLEAST64 + SCNdFAST8 SCNiFAST8 SCNoFAST8 SCNuFAST8 SCNxFAST8 + SCNdFAST16 SCNiFAST16 SCNoFAST16 SCNuFAST16 SCNxFAST16 + SCNdFAST32 SCNiFAST32 SCNoFAST32 SCNuFAST32 SCNxFAST32 + SCNdFAST64 SCNiFAST64 + SCNoFAST64 SCNuFAST64 SCNxFAST64 + SCNdMAX SCNiMAX SCNoMAX SCNuMAX SCNxMAX +#ifdef INTPTR_MAX + SCNdPTR SCNiPTR +#endif +#ifdef UINTPTR_MAX + SCNoPTR SCNuPTR SCNxPTR +#endif + ; + +int +main (void) +{ + return 0; +} diff --git a/tests/test-inttypes.c b/tests/test-inttypes.c deleted file mode 100644 index 036ca510cf..0000000000 --- a/tests/test-inttypes.c +++ /dev/null @@ -1,116 +0,0 @@ -/* Test of <inttypes.h> substitute. - Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ - -/* Written by Bruno Haible <bruno@clisp.org>, 2007. */ - -#include <config.h> - -#include <inttypes.h> - -/* Tests for macros supposed to be defined in inttypes.h. */ - -const char *k = /* implicit string concatenation */ -#ifdef INT8_MAX - PRId8 PRIi8 -#endif -#ifdef UINT8_MAX - PRIo8 PRIu8 PRIx8 PRIX8 -#endif -#ifdef INT16_MAX - PRId16 PRIi16 -#endif -#ifdef UINT16_MAX - PRIo16 PRIu16 PRIx16 PRIX16 -#endif -#ifdef INT32_MAX - PRId32 PRIi32 -#endif -#ifdef UINT32_MAX - PRIo32 PRIu32 PRIx32 PRIX32 -#endif -#ifdef INT64_MAX - PRId64 PRIi64 -#endif -#ifdef UINT64_MAX - PRIo64 PRIu64 PRIx64 PRIX64 -#endif - PRIdLEAST8 PRIiLEAST8 PRIoLEAST8 PRIuLEAST8 PRIxLEAST8 PRIXLEAST8 - PRIdLEAST16 PRIiLEAST16 PRIoLEAST16 PRIuLEAST16 PRIxLEAST16 PRIXLEAST16 - PRIdLEAST32 PRIiLEAST32 PRIoLEAST32 PRIuLEAST32 PRIxLEAST32 PRIXLEAST32 - PRIdLEAST64 PRIiLEAST64 - PRIoLEAST64 PRIuLEAST64 PRIxLEAST64 PRIXLEAST64 - PRIdFAST8 PRIiFAST8 PRIoFAST8 PRIuFAST8 PRIxFAST8 PRIXFAST8 - PRIdFAST16 PRIiFAST16 PRIoFAST16 PRIuFAST16 PRIxFAST16 PRIXFAST16 - PRIdFAST32 PRIiFAST32 PRIoFAST32 PRIuFAST32 PRIxFAST32 PRIXFAST32 - PRIdFAST64 PRIiFAST64 - PRIoFAST64 PRIuFAST64 PRIxFAST64 PRIXFAST64 - PRIdMAX PRIiMAX PRIoMAX PRIuMAX PRIxMAX PRIXMAX -#ifdef INTPTR_MAX - PRIdPTR PRIiPTR -#endif -#ifdef UINTPTR_MAX - PRIoPTR PRIuPTR PRIxPTR PRIXPTR -#endif - ; -const char *l = /* implicit string concatenation */ -#ifdef INT8_MAX - SCNd8 SCNi8 -#endif -#ifdef UINT8_MAX - SCNo8 SCNu8 SCNx8 -#endif -#ifdef INT16_MAX - SCNd16 SCNi16 -#endif -#ifdef UINT16_MAX - SCNo16 SCNu16 SCNx16 -#endif -#ifdef INT32_MAX - SCNd32 SCNi32 -#endif -#ifdef UINT32_MAX - SCNo32 SCNu32 SCNx32 -#endif -#ifdef INT64_MAX - SCNd64 SCNi64 -#endif -#ifdef UINT64_MAX - SCNo64 SCNu64 SCNx64 -#endif - SCNdLEAST8 SCNiLEAST8 SCNoLEAST8 SCNuLEAST8 SCNxLEAST8 - SCNdLEAST16 SCNiLEAST16 SCNoLEAST16 SCNuLEAST16 SCNxLEAST16 - SCNdLEAST32 SCNiLEAST32 SCNoLEAST32 SCNuLEAST32 SCNxLEAST32 - SCNdLEAST64 SCNiLEAST64 - SCNoLEAST64 SCNuLEAST64 SCNxLEAST64 - SCNdFAST8 SCNiFAST8 SCNoFAST8 SCNuFAST8 SCNxFAST8 - SCNdFAST16 SCNiFAST16 SCNoFAST16 SCNuFAST16 SCNxFAST16 - SCNdFAST32 SCNiFAST32 SCNoFAST32 SCNuFAST32 SCNxFAST32 - SCNdFAST64 SCNiFAST64 - SCNoFAST64 SCNuFAST64 SCNxFAST64 - SCNdMAX SCNiMAX SCNoMAX SCNuMAX SCNxMAX -#ifdef INTPTR_MAX - SCNdPTR SCNiPTR -#endif -#ifdef UINTPTR_MAX - SCNoPTR SCNuPTR SCNxPTR -#endif - ; - -int -main (void) -{ - return 0; -}