luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2018-11-15 15:57:58 -05:00
parent a2ef591c8d 395fb1a8d6
commit eca3ba25b3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext2spice/ext2hier.c
View File

@ -1299,12 +1299,11 @@ char *nodeSpiceHierName(hc, hname)
HierName *hname;
{
EFNodeName *nn;
HashEntry *he;
HashEntry *he, *he2;
EFNode *node;
Def *def = hc->hc_use->use_def;
// he = HashLookOnly(&def->def_nodes, EFHNToStr(hname));
he = HashLookOnly(&efNodeHashTable, (char *)hname);
he = EFHNLook(hname, NULL, "ext2spice");
if (he == NULL) return "error";
nn = (EFNodeName *) HashGetValue(he);

2
extflat/EFbuild.c
View File

@ -1632,6 +1632,8 @@ efNodeMerge(node1, node2)
*/
if (node2->efnode_flags & EF_PORT)
node1->efnode_flags |= EF_PORT;
if (node2->efnode_flags & EF_TOP_PORT)
node1->efnode_flags |= EF_TOP_PORT;
/*
* If node2 has the EF_SUBS_NODE flag set, then copy the port