From: Bruno Haible Date: Sat, 10 Jan 2026 21:17:40 +0000 (+0100) Subject: libtextstyle: Assume a working . X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=144474ff645593d9476120dd6720d8c0fe1bd5d3;p=thirdparty%2Fgettext.git libtextstyle: Assume a working . * libtextstyle/lib/textstyle.h: Include instead of . * libtextstyle/lib/Makefile.am (nobase_nodist_include_HEADERS): Don't add textstyle/stdbool.h. (textstyle/stdbool.h): Remove rule. (BUILT_SOURCES, MOSTLYCLEANFILES, CLEANFILES): Update accordingly. (EXTRA_DIST): Remove stdbool.mini.h. * libtextstyle/lib/stdbool.mini.h: Remove file. * gettext-tools/src/Makefile.am (textstyle/stdbool.h): Remove target. (BUILT_SOURCES, MOSTLYCLEANFILES): Remove textstyle/stdbool.h. --- diff --git a/.gitignore b/.gitignore index 0b6d71c27..f6d2af7fc 100644 --- a/.gitignore +++ b/.gitignore @@ -968,7 +968,6 @@ core /gettext-tools/po/??@*.insert-header /gettext-tools/src/gettext.res /gettext-tools/src/textstyle.h -/gettext-tools/src/textstyle/stdbool.h /gettext-tools/src/textstyle/version.h /gettext-tools/src/textstyle/woe32dll.h diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 7b74b72dc..1e6ae7f72 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/src subdirectory of GNU gettext -## Copyright (C) 1995-2025 Free Software Foundation, Inc. +## Copyright (C) 1995-2026 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 @@ -433,12 +433,12 @@ if USE_INSTALLED_LIBTEXTSTYLE LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@ else # How to get the include files of libtextstyle. -textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: +textstyle.h textstyle/version.h textstyle/woe32dll.h: here=`pwd`; \ cd ../../libtextstyle/lib && \ $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS DESTDIR= includedir="$$here" -BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h -MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h +BUILT_SOURCES += textstyle.h textstyle/version.h textstyle/woe32dll.h +MOSTLYCLEANFILES += textstyle.h textstyle/version.h textstyle/woe32dll.h # Where to find the built libtextstyle library. LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la endif diff --git a/libtextstyle/.gitignore b/libtextstyle/.gitignore index 83b685710..4590a6b4e 100644 --- a/libtextstyle/.gitignore +++ b/libtextstyle/.gitignore @@ -489,7 +489,6 @@ autom4te.cache/ /lib/libglib_rpl.la /lib/libtextstyle.la /lib/libxml_rpl.la -/lib/textstyle/stdbool.h # Executables generated by "make": /adhoc-tests/hello /adhoc-tests/hello.exe diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am index c1840101d..8291d5c2d 100644 --- a/libtextstyle/lib/Makefile.am +++ b/libtextstyle/lib/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the lib subdirectory of GNU libtextstyle. -## Copyright (C) 2009-2025 Free Software Foundation, Inc. +## Copyright (C) 2009-2026 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 @@ -68,37 +68,6 @@ libtextstyle_la_SOURCES += \ misc.h misc.c \ version.c -# The replacement that can be installed. -nobase_nodist_include_HEADERS += \ - textstyle/stdbool.h - -# Produce a textstyle/stdbool.h that is not compiler dependent. -# GCC >= 2.95 has . -# AIX >= 5.3 has . -# Solaris 10 and some HP-UX 11 versions have but it does not -# necessarily work. -textstyle/stdbool.h : $(STDBOOL_H) stdbool.mini.h - @MKDIR_P@ textstyle - rm -f $@-t $@ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - echo '#if !defined _GL_STDBOOL_H'; \ - if test -f /usr/include/stdbool.h; then \ - echo '#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) || defined _AIX'; \ - else \ - echo '#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))'; \ - fi; \ - echo '#include '; \ - echo '#else'; \ - cat $(srcdir)/stdbool.mini.h; \ - echo '#endif'; \ - echo '#endif'; \ - } > $@-t - mv $@-t $@ -BUILT_SOURCES += textstyle/stdbool.h -MOSTLYCLEANFILES += textstyle/stdbool.h-t -CLEANFILES += textstyle/stdbool.h -EXTRA_DIST += stdbool.mini.h - # textstyle/version.h is public. nobase_nodist_include_HEADERS += textstyle/version.h diff --git a/libtextstyle/lib/stdbool.mini.h b/libtextstyle/lib/stdbool.mini.h deleted file mode 100644 index eacba943b..000000000 --- a/libtextstyle/lib/stdbool.mini.h +++ /dev/null @@ -1,110 +0,0 @@ -/* Copyright (C) 2001-2003, 2006-2017, 2019 Free Software Foundation, Inc. - Written by Bruno Haible , 2001. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2, 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, see . */ - -#ifndef _TEXTSTYLE_STDBOOL_H -#define _TEXTSTYLE_STDBOOL_H - -/* ISO C 99 for platforms that lack it. */ - -/* Usage suggestions: - - Programs that use should be aware of some limitations - and standards compliance issues. - - Standards compliance: - - - must be #included before 'bool', 'false', 'true' - can be used. - - - You cannot assume that sizeof (bool) == 1. - - - Programs should not undefine the macros bool, true, and false, - as C99 lists that as an "obsolescent feature". - - Limitations of this substitute, when used in a C89 environment: - - - must be #included before the '_Bool' type can be used. - - - You cannot assume that _Bool is a typedef; it might be a macro. - - - Bit-fields of type 'bool' are not supported. Portable code - should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'. - - - In C99, casts and automatic conversions to '_Bool' or 'bool' are - performed in such a way that every nonzero value gets converted - to 'true', and zero gets converted to 'false'. This doesn't work - with this substitute. With this substitute, only the values 0 and 1 - give the expected result when converted to _Bool' or 'bool'. - - - C99 allows the use of (_Bool)0.0 in constant expressions, but - this substitute cannot always provide this property. - - Also, it is suggested that programs use 'bool' rather than '_Bool'; - this isn't required, but 'bool' is more common. */ - - -/* 7.16. Boolean type and values */ - -#ifdef __cplusplus - /* Assume the compiler has 'bool' and '_Bool'. */ -#else - /* is known to exist and work with the following compilers: - - GNU C 3.0 or newer, on any platform, - - Intel C, - - MSVC 12 (Visual Studio 2013) or newer, - - Sun C, on Solaris, if _STDC_C99 is defined, - - AIX xlc, if _ANSI_C_SOURCE is defined, - - HP C, on HP-UX 11.31 or newer. - It is know not to work with: - - Sun C, on Solaris, if __C99FEATURES__ is defined but _STDC_C99 is not, - - MIPSpro C 7.30, on IRIX. */ -# if (__GNUC__ >= 3) \ - || defined __INTEL_COMPILER \ - || (_MSC_VER >= 1800) \ - || (defined __SUNPRO_C && defined _STDC_C99) \ - || (defined _AIX && !defined __GNUC__ && defined _ANSI_C_SOURCE) \ - || defined __HP_cc - /* Assume the compiler has . */ -# include -# else - /* Need to define _Bool ourselves. As 'signed char' or as an enum type? - Use of a typedef, with SunPRO C, leads to a stupid - "warning: _Bool is a keyword in ISO C99". - Use of an enum type, with IRIX cc, leads to a stupid - "warning(1185): enumerated type mixed with another type". - Even the existence of an enum type, without a typedef, - "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. - The only benefit of the enum, debuggability, is not important - with these compilers. So use 'signed char' and no enum. */ -# define _Bool signed char -# define bool _Bool -# endif -#endif - -/* The other macros must be usable in preprocessor directives. */ -#ifdef __cplusplus -# define false false -# define true true -#else -# undef false -# define false 0 -# undef true -# define true 1 -#endif - -#define __bool_true_false_are_defined 1 - -#endif /* _TEXTSTYLE_STDBOOL_H */ diff --git a/libtextstyle/lib/textstyle.h b/libtextstyle/lib/textstyle.h index ce0bf6e01..0fc055e40 100644 --- a/libtextstyle/lib/textstyle.h +++ b/libtextstyle/lib/textstyle.h @@ -1,5 +1,5 @@ /* Public API of the libtextstyle library. - Copyright (C) 2006-2007, 2019-2021 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2019-2026 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 @@ -20,9 +20,9 @@ #define _TEXTSTYLE_H #include +#include #include #include -#include #include /* Meta information. */