diff options
| author | François Andriot <francois.andriot@free.fr> | 2021-05-11 13:16:41 +0200 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-12 11:11:33 +0900 |
| commit | 56a28b57eaaa8266b4b053c380027f617fe3cde0 (patch) | |
| tree | 2887c81b586efd8846bbf3eca73e3cae11960dd2 | |
| parent | e33521544b3733bb12b91b3e55db5ed677207fd2 (diff) | |
| download | kpilot-56a28b57.tar.gz kpilot-56a28b57.zip | |
Fix ftbfs on Fedora 34
error: reference to ‘byte’ is ambiguous
Signed-off-by: François Andriot <francois.andriot@free.fr>
(cherry picked from commit a499c5423bb9ada3d01d76bb9535a7968956445d)
| -rw-r--r-- | conduits/docconduit/makedoc9.h | 8 |
1 files 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); }}; |