mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

cad/gds3d: Fix build breakaga on 14 due to the 'byte' symbol collision

Browse Source 
The previous fix didn't include one more location.
This commit is contained in:
Yuri Victorovich 2023-07-18 07:21:39 -07:00
parent 3972be5527
commit 48eaab4ce1
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cad/gds3d/files/patch-manual-gdsparse.cpp Normal file
View File

@ -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;