git: 48eaab4ce10e - main - cad/gds3d: Fix build breakaga on 14 due to the 'byte' symbol collision

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=48eaab4ce10eeea0a409118ad2c340dbc6a2c1f8

commit 48eaab4ce10eeea0a409118ad2c340dbc6a2c1f8
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-18 14:21:39 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-18 14:21:39 +0000

    cad/gds3d: Fix build breakaga on 14 due to the 'byte' symbol collision
    
    The previous fix didn't include one more location.
---
 cad/gds3d/files/patch-manual-gdsparse.cpp | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/cad/gds3d/files/patch-manual-gdsparse.cpp b/cad/gds3d/files/patch-manual-gdsparse.cpp
new file mode 100644
index 000000000000..5042567f1bf9
--- /dev/null
+++ b/cad/gds3d/files/patch-manual-gdsparse.cpp
@@ -0,0 +1,33 @@
+- workaround for error: reference to 'byte' is ambiguous, see https://github.com/trilomix/GDS3D/issues/23
+
+--- ../libgdsto3d/gdsparse.cpp.orig	2023-07-20 10:59:11.684448000 -0700
++++ ../libgdsto3d/gdsparse.cpp	2023-07-20 10:59:35.325794000 -0700
+@@ -127,7 +127,7 @@
+ 
+ bool GDSParse::ParseFile(char *topcell)
+ {
+-	byte recordtype, datatype;
++	::byte recordtype, datatype;
+ 	char *tempstr;
+ 	//struct ProcessLayer *layer = NULL;
+     
+@@ -1086,7 +1086,7 @@
+ 
+ short GDSParse::GetBitArray()
+ {
+-	byte byte1;
++	::byte byte1;
+ 
+ 	fread(&byte1, 1, 1, _iptr);
+ 	fread(&byte1, 1, 1, _iptr);
+@@ -1097,8 +1097,8 @@
+ 
+ double GDSParse::GetEightByteReal()
+ {
+-	byte value;
+-	byte b8, b2, b3, b4, b5, b6, b7;
++	::byte value;
++	::byte b8, b2, b3, b4, b5, b6, b7;
+ 	double sign=1.0;
+ 	double exponent;
+ 	double mant;