[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 71/78: Fix Savannah #63831.
From: |
G. Branden Robinson |
Subject: |
[groff] 71/78: Fix Savannah #63831. |
Date: |
Fri, 7 Apr 2023 12:17:59 -0400 (EDT) |
gbranden pushed a commit to branch branden-2023-04-07
in repository groff.
commit c3fe9f745632e72b2e97a7afefe049ce2794839c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Mar 16 18:28:16 2023 -0500
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 846fbaa97..4561230a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-16 G. Branden Robinson <g.branden.robinson@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-04-05 G. Branden Robinson <g.branden.robinson@gmail.com>
* tmac/tty.tmac: Add angle bracket fallbacks.
diff --git a/PROBLEMS b/PROBLEMS
index 102d85024..7b99dbb1c 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -922,21 +922,6 @@ Some test failures remain expected on Solaris 10.
----------------------------------------------------------------------
-* 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
-
-----------------------------------------------------------------------
-
* I am building from the Git repository, using 'autoreconf' from a GNU
Autoconf release earlier than 2.69, and I get this.
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; \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 71/78: Fix Savannah #63831.,
G. Branden Robinson <=