git: 450ca6e2b5bf - 2023Q3 - cad/gds3d: Fix build on 14
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 09 Jul 2023 08:52:21 UTC
The branch 2023Q3 has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=450ca6e2b5bf54d5f0f45b790ee1289bc5988a94
commit 450ca6e2b5bf54d5f0f45b790ee1289bc5988a94
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-09 08:51:16 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-09 08:52:19 +0000
cad/gds3d: Fix build on 14
Reported by: fallout
(cherry picked from commit 1f7d69835af4e7549632661924a236ed091c42cb)
---
cad/gds3d/files/patch-manual-gds_globals.h | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/cad/gds3d/files/patch-manual-gds_globals.h b/cad/gds3d/files/patch-manual-gds_globals.h
new file mode 100644
index 000000000000..f652a732d58b
--- /dev/null
+++ b/cad/gds3d/files/patch-manual-gds_globals.h
@@ -0,0 +1,17 @@
+- workaround for error: reference to 'byte' is ambiguous, see https://github.com/trilomix/GDS3D/issues/23
+
+--- ../libgdsto3d/gds_globals.h.orig 2023-07-09 01:42:32.116154000 -0700
++++ ../libgdsto3d/gds_globals.h 2023-07-09 01:42:59.001193000 -0700
+@@ -116,9 +116,9 @@
+
+ typedef struct gds_header{
+ short RecordLength;
+- byte RecordType;
+- byte DataType;
+- byte *Data;
++ ::byte RecordType;
++ ::byte DataType;
++ ::byte *Data;
+ }gds_header;
+
+ /* A word consists of 16 bits, numbered from 0 to 15, left to right. */