gbranden pushed a commit to branch branden-2023-07-05 in repository groff. commit 3b018cd92af1a0b5164b3c86f0f1b3cf2ef65136 Author: G. Branden Robinson <g.branden.robin...@gmail.com> AuthorDate: Thu Mar 16 18:28:16 2023 -0500
[libxutil]: Fix Savannah #63831. * src/libs/libxutil/XFontName.c (utoa): Rename function from this... (xu_utoa): ...to this, to avoid name collision when using "newlib" portability library. (XFormatFontName): Update call site. * PROBLEMS: Drop item. Fixes <https://savannah.gnu.org/bugs/?63831>. Thanks to Brian Inglis for the report. --- ChangeLog | 12 ++++++++++++ PROBLEMS | 15 --------------- src/libs/libxutil/XFontName.c | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49b30a4b5..5a7f62dc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2023-03-16 G. Branden Robinson <g.branden.robin...@gmail.com> + + * src/libs/libxutil/XFontName.c (utoa): Rename function from + this... + (xu_utoa): ...to this, to avoid name collision when using + "newlib" portability library. + (XFormatFontName): Update call site. + * PROBLEMS: Drop item. + + Fixes <https://savannah.gnu.org/bugs/?63831>. Thanks to Brian + Inglis for the report. + 2023-05-13 G. Branden Robinson <g.branden.robin...@gmail.com> [man]: Preserve user-selected font family. diff --git a/PROBLEMS b/PROBLEMS index a5a3d7090..d9b8fcf4b 100644 --- a/PROBLEMS +++ b/PROBLEMS @@ -809,21 +809,6 @@ isolate it in a future release. ---------------------------------------------------------------------- -* I get a build failure on Cygwin / a system using newlib and GCC 11. - -"newlib" defines a function called "utoa" which conflicts with a static -(file scope-local) function in src/libs/libxutil/XFontName.c. - -We expect to fix this in the near future; in the meantime, you can patch -the file to rename the function (and update its call sites) or, if you -don't require the "gxditview" output previewer or "xtotroff" utility, -you can build groff without X11 support. - - $ make distclean - $ ./configure --without-x - ----------------------------------------------------------------------- - * The "check-default-foundry" test fails when I run "make check". Your Ghostscript installation may have its fonts embedded in the diff --git a/src/libs/libxutil/XFontName.c b/src/libs/libxutil/XFontName.c index 81ccdaab2..fd31b6f14 100644 --- a/src/libs/libxutil/XFontName.c +++ b/src/libs/libxutil/XFontName.c @@ -119,7 +119,7 @@ XParseFontName (XFontNameString fontNameString, XFontName *fontName, } static char * -utoa (unsigned int u, char *s, int size) +xu_utoa (unsigned int u, char *s, int size) { char *t; @@ -156,7 +156,7 @@ XFormatFontName (XFontName *fontName, unsigned int fontNameAttributes, #define PutUnsigned(field, bit) \ f = (fontNameAttributes & bit) ? \ - utoa (fontName->field, number, sizeof (number)) \ + xu_utoa (fontName->field, number, sizeof (number)) \ : (char *)"*"; \ if ((left -= strlen (f)) < 0) \ return False; \ _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit