From 3d41b3e98bc08939588d6e8ec0699c7870f6aeba Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Thu, 24 Feb 2022 09:16:42 +1100 Subject: [PATCH] Fix a few issues with missing or incorrect prototypes There are a few places we either don't have a variable or function prototype and need one, or we have one and they don't match. --- cif/CIFgen.c | 1 + drc/DRCtech.c | 1 + drc/drc.h | 2 ++ extract/ExtSubtree.c | 6 +++--- lef/lefTech.c | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cif/CIFgen.c b/cif/CIFgen.c index ee9b2794..ba6f8dd4 100644 --- a/cif/CIFgen.c +++ b/cif/CIFgen.c @@ -39,6 +39,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include "utils/stack.h" #include "utils/malloc.h" #include "utils/maxrect.h" +#include "drc/drc.h" /* TRUE to run (very slow) algorithm for optimizing non-manhattan tiles */ /* (cuts size of output; see also the GDS "merge" option) */ diff --git a/drc/DRCtech.c b/drc/DRCtech.c index 462e47d0..cc669782 100644 --- a/drc/DRCtech.c +++ b/drc/DRCtech.c @@ -38,6 +38,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/ #include "utils/malloc.h" #include "cif/cif.h" #include "cif/CIFint.h" +#include "drc/drc.h" CIFStyle *drcCifStyle = NULL; bool DRCForceReload = FALSE; diff --git a/drc/drc.h b/drc/drc.h index 1fed06c4..1a8ad1be 100644 --- a/drc/drc.h +++ b/drc/drc.h @@ -281,6 +281,8 @@ extern void DRCPrintStyle(); extern void DRCSetStyle(); extern void DRCLoadStyle(); +extern PlaneMask CoincidentPlanes(TileTypeBitMask *typeMask, PlaneMask pmask); + /* The following macro can be used by the outside world to see if * the background checker needs to be called. */ diff --git a/extract/ExtSubtree.c b/extract/ExtSubtree.c index 916f5177..d793459f 100644 --- a/extract/ExtSubtree.c +++ b/extract/ExtSubtree.c @@ -65,11 +65,11 @@ extern Node *extHierNewNode(); extern ExtTree *extHierNewOne(); /* Global data incremented by extSubtree() */ -int extSubtreeTotalArea; /* Total area of cell */ -int extSubtreeInteractionArea; /* Total area of all interactions, counting the +long extSubtreeTotalArea; /* Total area of cell */ +long extSubtreeInteractionArea; /* Total area of all interactions, counting the * entire area of the interaction each time. */ -int extSubtreeClippedArea; /* Total area of all interactions, counting only +long extSubtreeClippedArea; /* Total area of all interactions, counting only * the area that lies inside each chunk, so no * area is counted more than once. */ diff --git a/lef/lefTech.c b/lef/lefTech.c index 9851ae61..64190fb9 100644 --- a/lef/lefTech.c +++ b/lef/lefTech.c @@ -37,6 +37,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header$"; #include "utils/malloc.h" #include "lef/lefInt.h" #include "drc/drc.h" +#include "cif/cif.h" /* ---------------------------------------------------------------------*/