From a499c5423bb9ada3d01d76bb9535a7968956445d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 11 May 2021 13:16:41 +0200 Subject: Fix ftbfs on Fedora 34 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error: reference to ‘byte’ is ambiguous Signed-off-by: François Andriot --- conduits/docconduit/makedoc9.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conduits/docconduit/makedoc9.h b/conduits/docconduit/makedoc9.h index 27e3695..7229c04 100644 --- a/conduits/docconduit/makedoc9.h +++ b/conduits/docconduit/makedoc9.h @@ -61,7 +61,7 @@ class tBuf { // int hicharnum; // bool space; - byte * buf; + ::byte * buf; unsigned len; bool isCompressed; public: @@ -81,9 +81,9 @@ class tBuf { delete[]buf; buf = 0L; } - void setText(const byte * text, unsigned int txtlen = + void setText(const ::byte * text, unsigned int txtlen = 0, bool txtcomp = false); - byte *text() const { + ::byte *text() const { return buf; } unsigned Len() const { @@ -102,7 +102,7 @@ class tBuf { unsigned Compress(); private: - unsigned Issue(byte src, int &bSpace); + unsigned Issue(::byte src, int &bSpace); void Dump() const { printf("\nbuffer len=%d", len); }}; -- cgit v1.2.1