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

Compatibility with C99 standard 

This commit makes the code (mostly) C99-compatible, enabling to compile
it without the -Wno-error=implicit-function-declaration flag. This
way, Magic becomes usable on arm64 architectures, specifically on Apple
computers with M1/M2 SoC.
This commit is contained in:
Alessandro De Laurenzis 2022-10-10 11:50:15 +02:00
parent 9d40fbfecb
commit b306a39560
151 changed files with 1095 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calma/CalmaRdcl.c
View File

@ -46,6 +46,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "calma/calmaInt.h"
#include "calma/calma.h"
/* C99 compat */
#include "drc/drc.h"
int calmaNonManhattan;
int CalmaFlattenLimit = 10;
int NameConvertErrors = 0;

3
calma/CalmaRdio.c
View File

@ -46,6 +46,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "textio/textio.h"
#include "calma/calmaInt.h"
/* C99 compat */
#include "calma/calma.h"
/* Forward declarations */
bool calmaReadR8();
bool calmaSkipBytes();

3
calma/CalmaRdpt.c
View File

@ -48,6 +48,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "calma/calmaInt.h"
#include "calma/calma.h"
/* C99 compat */
#include "drc/drc.h"
extern int calmaNonManhattan;
extern int CalmaPolygonCount;

3
calma/CalmaRead.c
View File

@ -49,6 +49,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/main.h" /* for EditCellUse */
#include "utils/undo.h"
/* C99 compat */
#include "calma/calma.h"
/* Globals for Calma reading */
FILETYPE calmaInputFile = NULL; /* Read from this stream */
FILE *calmaErrorFile = NULL; /* Write error output here */

4
calma/CalmaWrite.c
View File

@ -53,6 +53,10 @@ static char rcsid[] __attribute__ ((unused)) ="$Header: /usr/cvsroot/magic-8.0/c
#include "utils/main.h" /* for Path and CellLibPath */
#include "utils/stack.h"
/* C99 compat */
#include "utils/undo.h"
#include "calma/calma.h"
/* Exports */
bool CalmaDoLibrary = FALSE; /* If TRUE, do not output the top level */
bool CalmaDoLabels = TRUE; /* If FALSE, don't output labels with GDS-II */

4
calma/CalmaWriteZ.c
View File

@ -63,6 +63,10 @@ static char rcsid[] __attribute__ ((unused)) ="$Header: /usr/cvsroot/magic-8.0/c
#include "utils/main.h" /* for Path and CellLibPath */
#include "utils/stack.h"
/* C99 compat */
#include "utils/undo.h"
#include "calma/calma.h"
/* External variables from CalmaWrite.c */
extern HashTable calmaLibHash;
extern HashTable calmaPrefixHash;

30
calma/calma.h
View File

@ -43,7 +43,7 @@ extern char **CalmaFlattenUsesByName;
extern bool CalmaReadOnly;
extern bool CalmaContactArrays;
#ifdef HAVE_ZLIB
extern bool CalmaCompression;
extern int CalmaCompression;
#endif
extern bool CalmaPostOrder;
extern bool CalmaAllowUndefined;
@ -55,6 +55,34 @@ extern void CalmaTechInit();
extern bool CalmaGenerateArray();
extern void CalmaReadError();
/* C99 compat */
extern void CalmaReadError();
extern int calmaAddSegment();
extern void calmaDelContacts();
extern void calmaElementBoundary();
extern void calmaElementBox();
extern void calmaElementPath();
extern void calmaElementText();
extern bool calmaIsUseNameDefault();
extern bool calmaParseStructure();
extern int calmaProcessDef();
extern int calmaProcessDefZ();
extern bool calmaReadI2Record();
extern bool calmaReadI4Record();
extern void calmaReadPoint();
extern bool calmaReadR8();
extern bool calmaReadStampRecord();
extern bool calmaReadStringRecord();
extern bool calmaReadStringRecord();
extern bool calmaReadTransform();
extern bool calmaSkipBytes();
extern bool calmaSkipExact();
extern bool calmaSkipTo();
extern void calmaUnexpected();
extern void calmaMergeSegments();
extern void calmaRemoveDegenerate();
extern void calmaRemoveColinear();
#ifdef HAVE_ZLIB
extern bool CalmaWriteZ();
#endif

4
cif/CIFgen.c
View File

@ -41,6 +41,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/maxrect.h"
#include "drc/drc.h"
/* C99 compat */
#include "textio/textio.h"
#include "utils/undo.h"
/* TRUE to run (very slow) algorithm for optimizing non-manhattan tiles */
/* (cuts size of output; see also the GDS "merge" option) */
bool CIFUnfracture = FALSE;

20
cif/CIFint.h
View File

@ -327,6 +327,26 @@ extern int cifHierCopyMaskHints();
extern void CIFLoadStyle();
extern void CIFCopyMaskHints();
/* C99 compat */
extern void CIFCoverageLayer();
extern bool CIFWriteFlat();
extern void CIFScalePlanes();
extern void CIFInputRescale();
extern int CIFCalmaLayerToCifLayer();
extern int CIFScaleCoord();
extern void CIFPropRecordPath();
extern void CIFPaintWirePath();
extern void CIFMakeManhattanPath();
extern int cifGrowSliver();
extern int cifHierElementFunc();
extern int cifSquareFunc();
extern int cifSquareGridFunc();
extern int cifSlotFunc();
extern int CIFParseScale();
extern int cifParseCalmaNums();
extern int CIFEdgeDirection();
extern bool CIFReadTechLimitScale();
/* Shared variables and structures: */
extern Plane *CIFPlanes[]; /* Normal place to store CIF. */

2
cif/CIFrdpt.c
View File

@ -37,6 +37,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "cif/CIFint.h"
#include "cif/CIFread.h"
/* C99 compat */
#include "textio/textio.h"
/*
* ----------------------------------------------------------------------------

3
cif/CIFrdtech.c
View File

@ -40,6 +40,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "calma/calmaInt.h"
#include "utils/malloc.h"
/* C99 compat */
#include "cif/cif.h"
/* Pointer to a list of all the CIF-reading styles: */
CIFReadKeep *cifReadStyleList = NULL;

16
cif/CIFrdutils.c
View File

@ -27,6 +27,12 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include <stdarg.h>
#include <ctype.h>
/*
* C99 compat
* Mind: tcltk/tclmagic.h must be included prior to all the other headers
*/
#include "tcltk/tclmagic.h"
#include "utils/magic.h"
#include "utils/geometry.h"
#include "tiles/tile.h"
@ -40,6 +46,16 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/undo.h"
#include "utils/malloc.h"
/* C99 compat */
#include "lef/lef.h"
#include "drc/drc.h"
#include "extract/extract.h"
#include "wiring/wiring.h"
#include "router/router.h"
#include "mzrouter/mzrouter.h"
#include "irouter/irouter.h"
#include "plow/plow.h"
/* The following variables are used to provide one character of
* lookahead. cifParseLaAvail is TRUE if cifParseLaChar contains
* a valid character, FALSE otherwise. The PEEK and TAKE macros

3
cif/CIFsee.c
View File

@ -35,6 +35,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "textio/textio.h"
#include "utils/undo.h"
/* C99 compat */
#include "drc/drc.h"
/* The following variable holds the CellDef into which feedback
* is to be placed for displaying CIF.
*/

5
cif/CIFtech.c
View File

@ -42,6 +42,11 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "cif/cif.h"
#include "drc/drc.h" /* For WRL's DRC-CIF extensions */
/* C99 compat */
#include "calma/calma.h"
#include "dbwind/dbwind.h"
#include "drc/drc.h"
/* The following statics are used to keep track of things between
* calls to CIFTechLine.
*/

5
cif/cif.h
View File

@ -56,7 +56,7 @@ extern void CIFTechInit();
extern bool CIFTechLine();
extern void CIFTechFinal();
extern void CIFTechOutputScale();
extern void CIFTechInputScale();
extern int CIFTechInputScale();
extern bool CIFTechLimitScale();
extern void CIFReadTechStyleInit();
extern void CIFReadTechInit();
@ -91,4 +91,7 @@ extern int CIFOutputScaleFactor();
extern void PaintWireList();
extern LinkedRect *PaintPolygon();
/* C99 compat */
extern int CIFGetContactSize();
#endif /* _CIF_H */

4
cmwind/cmwind.h
View File

@ -77,4 +77,8 @@ extern Rect cmwCurrentColorArea;
extern void cmwUndoColor(int, int, int, int, int, int, int);
extern bool CMWCheckWritten(void);
/* C99 compat */
extern void CMWinit();
#endif /* _CMWIND_H */

3
commands/CmdCD.c
View File

@ -51,6 +51,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "cif/CIFread.h"
#include "calma/calmaInt.h"
/* C99 compat */
#include "dbwind/dbwtech.h"
/* The following structure is used by CmdCorner to keep track of
* areas to be filled.
*/

3
commands/CmdE.c
View File

@ -44,6 +44,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "extract/extract.h"
#include "select/select.h"
/* C99 compat */
#include "dbwind/dbwtech.h"
/*
* ----------------------------------------------------------------------------

3
commands/CmdFI.c
View File

@ -58,6 +58,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "sim/sim.h"
#include "gcr/gcr.h"
/* C99 compat */
#include "cif/cif.h"
/* The following structure is used by CmdFill to keep track of
* areas to be filled.
*/

3
commands/CmdLQ.c
View File

@ -46,6 +46,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "select/select.h"
#include "netmenu/netmenu.h"
/* C99 compat */
#include "cif/cif.h"
/* Forward declarations */
void CmdPaintEraseButton();

10
commands/CmdRS.c
View File

@ -52,6 +52,15 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/signals.h"
#include "sim/sim.h"
/* C99 compat */
#include "cif/cif.h"
#include "lef/lef.h"
#include "extract/extract.h"
#include "irouter/irouter.h"
#include "mzrouter/mzrouter.h"
#include "router/router.h"
#include "wiring/wiring.h"
extern void DisplayWindow();
/* Used by CmdSetLabel() */
@ -260,7 +269,6 @@ CmdScaleGrid(w, cmd)
MagWindow *w;
TxCommand *cmd;
{
extern void DBScalePoint();
int scalen, scaled;
char *argsep;
Rect rootBox;

3
commands/CmdTZ.c
View File

@ -50,6 +50,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/tech.h"
#include "drc/drc.h"
/* C99 compat */
#include "cif/cif.h"
#ifdef LLNL
#include "yacr.h"
#endif /* LLNL */

3
commands/CmdWizard.c
View File

@ -46,6 +46,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/utils.h"
#include "textio/txcommands.h"
/* C99 compat */
#include "extract/extract.h"
/* Forward declarations */
extern void cmdPsearchStats();

12
commands/commands.h
View File

@ -64,4 +64,16 @@ extern void CmdDoMacro();
extern TileType CmdFindNetProc();
extern bool CmdCheckForPaintFunc();
/* C99 compat */
extern int cmdScaleCoord();
extern void FlatCopyAllLabels();
extern bool cmdDumpParseArgs();
extern void cmdFlushCell();
extern int cmdParseCoord();
extern void cmdSaveCell();
extern void CmdInit();
extern void CmdDoProperty();
extern void CmdPaintEraseButton();
#endif /* _COMMANDS_H */

3
database/DBcellcopy.c
View File

@ -35,6 +35,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "dbwind/dbwind.h"
#include "commands/commands.h"
/* C99 compat */
#include "graphics/graphics.h"
/*
* The following variable points to the tables currently used for
* painting. The paint tables are occasionally switched, by clients

3
database/DBconnect.c
View File

@ -36,6 +36,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/signals.h"
#include "utils/malloc.h"
/* C99 compat */
#include "textio/textio.h"
/* Global variable */
Stack *dbConnectStack = (Stack *)NULL;

12
database/DBio.c
View File

@ -63,6 +63,18 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/malloc.h"
#include "utils/signals.h"
/* C99 compat */
#include "dbwind/dbwtech.h"
#include "cif/cif.h"
#include "lef/lef.h"
#include "commands/commands.h"
#include "graphics/graphics.h"
#include "irouter/irouter.h"
#include "mzrouter/mzrouter.h"
#include "router/router.h"
#include "wiring/wiring.h"
#include "extract/extract.h"
#ifndef _PATH_TMP
#define _PATH_TMP "/tmp"
#endif

60
database/database.h.in
View File

@ -861,7 +861,7 @@ extern void DBClearCellPlane();
/* Insertion/deletion of cell uses into the name space of a parent */
extern bool DBLinkCell();
extern void DBUnlinkCell();
extern void DBUnLinkCell();
/* Deletion of cell defs */
extern void DBUndoReset();
@ -947,6 +947,64 @@ extern bool DBNearestLabel();
extern int DBSrLabelLoc();
extern TileType DBTransformDiagonal();
/* C99 compat */
extern void DBEraseValid();
extern void DBPaintValid();
extern void DBTreeCountPaint();
extern FILE *dbReadOpen();
extern int DBLoadFont();
extern int DBNameToFont();
extern int DBFontChar();
extern void DBFontInitCurves();
extern void DBUndoEraseLabel();
extern void DBUndoPutLabel();
extern bool DBCellRename();
extern bool DBCellDelete();
extern int DBCellSrArea();
extern int DBSrCellPlaneArea();
extern int DBMoveCell();
extern bool DBReLinkCell();
extern int DBBoundCellPlane();
extern Label *DBCheckLabelsByContent();
extern void DBMaskAddStacking();
extern bool DBIsChild();
extern void DBScaleEverything();
extern bool DBScalePoint();
extern int DBScaleCell();
extern TileType DBTechNameTypes();
extern void DBTreeFindUse();
extern void DBGenerateUniqueIds();
extern TileType DBInvTransformDiagonal();
extern bool DBIsSubcircuit();
extern int DBSrPaintNMArea();
extern int DBTreeSrNMTiles();
extern void DRCOffGridError();
extern int dbCellUsePrintFunc();
extern int dbTechContactResidues();
extern TileType dbTechNewStackedType();
extern void dbUndoEdit();
extern void DBSplitTile();
extern int DBSrCellUses();
extern TileType DBTechNameTypeExact();
extern void dbInstanceUnplace();
extern int dbIsPrimary();
extern void dbTechMatchResidues();
extern void DBUndoInit();
extern void DBResetTilePlane();
extern void DBNewYank();
extern int DBSrPaintClient();
extern int DBSrConnect();
extern char *dbFgets();
extern void DBAdjustLabelsNew();
extern bool DBScaleValue();
extern int DBMergeNMTiles0();
extern int DBSearchLabel();
extern int dbCellUniqueTileSrFunc();
extern void DBWDrawFontLabel();
extern void DBCellCopyManhattanPaint();
extern bool dbScalePlane();
extern int DBPaintPlaneVert();
/* -------------------------- Layer locking ------------------------------*/
extern TileTypeBitMask DBActiveLayerBits; /* Layers that are locked */

3
database/databaseInt.h
View File

@ -212,6 +212,9 @@ ClientData dbTechNameLookup();
ClientData dbTechNameLookupExact();
extern int strcmpbynum();
/* C99 compat */
extern int dbScaleCell();
/* --------------- Internal database technology variables ------------- */
/*

3
dbwind/DBWbuttons.c
View File

@ -40,6 +40,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "textio/txcommands.h"
#include "utils/utils.h"
/* C99 compat */
#include "commands/commands.h"
/* The arrays below are used to store information about the various
* button handlers that have registered themselves.
*/

3
dbwind/DBWdisplay.c
View File

@ -42,6 +42,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/tech.h"
#include "utils/signals.h"
/* C99 compat */
#include "textio/textio.h"
/* The following variable is exported to the rest of the world.
* It is read from the "styletype" line of the technology file,
* and defines the class of display styles file expected for

3
dbwind/DBWelement.c
View File

@ -30,6 +30,9 @@
#include "utils/malloc.h"
#include "utils/signals.h"
/* C99 compat */
#include "textio/textio.h"
/* Types of elements */
#define ELEMENT_RECT 0

3
dbwind/DBWfdback.c
View File

@ -40,6 +40,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/malloc.h"
#include "utils/signals.h"
/* C99 compat */
#include "textio/textio.h"
/* Use a reference-counted character structure for feedback info */
typedef struct rcstring

14
dbwind/dbwind.h
View File

@ -198,7 +198,7 @@ extern void DBWUndoNewEdit();
extern void DBWHLAddClient();
extern void DBWHLRemoveClient();
extern void DBWHLRedraw();
extern int DBWHLRedrawWind();
extern int DBWHLRedrawWind();
extern void DBWDrawBox();
extern void DBWDrawCrosshair();
@ -232,6 +232,18 @@ extern char *DBWPrintElements();
extern void DBWScaleElements();
extern void DBWScaleCrosshair();
/* C99 compat */
extern void DBWreload();
extern void DBWInitCommands();
extern void dbwUndoInit();
extern void dbwFeedbackInit();
extern void DBWElementPos();
extern bool DBCellDeleteUse();
extern void DBWHLRedrawPrepWindow();
extern void CmdInit();
extern void DBWinit();
extern int DBWTechParseStyle();
/* Random procedures used internally to this module. None of these
* should ever need to be called by the outside world.
*/

7
dbwind/dbwtech.h
View File

@ -16,6 +16,11 @@ extern TileTypeBitMask *DBWStyleToTypesTbl;
#define DBWStyleToTypes(s) (DBWStyleToTypesTbl + s)
/* forward declarations */
int DBWTechParseStyle();
extern int DBWTechParseStyle();
/* C99 compat */
extern void DBWElementStyle();
extern void DBWElementText();
extern void DBWSetCrosshair();
#endif /* _DBWTECH_H */

5
drc/DRCcif.c
View File

@ -46,7 +46,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/signals.h"
#include "utils/stack.h"
#include "utils/malloc.h"
#include "utils/utils.h"
/* C99 compat */
#include "utils/tech.h"
#include "textio/textio.h"
extern int drcCifTile();
extern int areaCifCheck();

5
drc/DRCtech.c
View File

@ -28,7 +28,6 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "tcltk/tclmagic.h"
#include "utils/magic.h"
#include "utils/geometry.h"
#include "utils/utils.h"
#include "tiles/tile.h"
#include "utils/hash.h"
#include "database/database.h"
@ -40,6 +39,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "cif/CIFint.h"
#include "drc/drc.h"
/* C99 compat */
#include "utils/tech.h"
#include "plow/plow.h"
CIFStyle *drcCifStyle = NULL;
bool DRCForceReload = FALSE;
HashTable DRCWhyErrorTable; /* Table of DRC errors */

15
drc/drc.h
View File

@ -286,6 +286,21 @@ extern void DRCLoadStyle();
extern PlaneMask CoincidentPlanes(TileTypeBitMask *typeMask, PlaneMask pmask);
/* C99 compat */
extern void DRCBreak();
extern void DRCFlatCheck();
extern void DRCWhyAll();
extern void drcCifInit();
extern void drcCifCheck();
extern void drcCifFinal();
extern void drcCheckAngles();
extern void drcCheckArea();
extern int drcCheckMaxwidth();
extern void drcCheckRectSize();
extern void drcCheckOffGrid();
extern int LowestMaskBit();
extern void drcCifScale();
/* The following macro can be used by the outside world to see if
* the background checker needs to be called.
*/

7
ext2sim/ext2sim.c
View File

@ -40,6 +40,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/runstats.h"
#include "utils/malloc.h"
/* C99 compat */
#include "extflat/extflat.h"
/* Forward declarations */
void CmdExtToSim();
bool simnAP();
@ -48,6 +51,10 @@ int simParseArgs();
int simdevVisit(), simresistVisit(), simcapVisit(), simnodeVisit();
int simmergeVisit();
/* C99 compat */
int simdevOutNode();
int simdevSubstrate();
/* Options specific to ext2sim */
#ifdef EXT2SIM_AUTO
bool esDevNodesOnly = FALSE;

3
ext2spice/ext2hier.c
View File

@ -46,6 +46,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/runstats.h"
#include "ext2spice/ext2spice.h"
/* C99 compat */
#include "extflat/extflat.h"
/* These global values are defined in ext2spice.c */
extern HashTable subcktNameTable;
extern DQueue subcktNameQueue;

12
ext2spice/ext2spice.h
View File

@ -41,6 +41,18 @@ extern float getCurDevMult();
extern void addDevMult();
extern void setDevMult();
/* C99 compat */
extern int EFHNSprintf();
extern int printSubcktDict();
extern int spcdevOutNode();
extern int spcnAP();
extern int parallelDevs();
extern int nodeHspiceName();
extern int devDistJunctHierVisit();
extern int spcnAPHier();
extern void mergeAttr();
extern int update_w();
/* Options specific to ext2spice */
extern bool esDoExtResis;
extern bool esDoPorts;

3
extflat/EFargs.c
View File

@ -36,6 +36,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "extflat/extflat.h"
#include "extflat/EFint.h"
/* C99 compat */
#include "textio/textio.h"
#define atoCap(s) ((EFCapValue)atof(s))
/* --------------------- Visible outside extflat ---------------------- */

3
extflat/EFbuild.c
View File

@ -37,6 +37,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header$";
#include "extract/extract.h" /* for device class list */
#include "extract/extractInt.h" /* for extGetDevType() */
/* C99 compat */
#include "textio/textio.h"
/*
* To avoid allocating ridiculously large amounts of memory to hold
* transistor types and the names of node types, we maintain the following

3
extflat/EFflat.c
View File

@ -34,6 +34,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "extflat/extflat.h"
#include "extflat/EFint.h"
/* C99 compat */
#include "textio/textio.h"
/* Initial size of the hash table of all flattened node names */
#define INITFLATSIZE 1024

3
extflat/EFname.c
View File

@ -34,6 +34,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "extflat/extflat.h"
#include "extflat/EFint.h"
/* C99 compat */
#include "textio/textio.h"
#ifdef MAGIC_WRAPPER
#define PrintErr TxError
#else

3
extflat/EFread.c
View File

@ -41,6 +41,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "extract/extractInt.h"
#include "utils/paths.h"
/* C99 compat */
#include "textio/textio.h"
#ifndef MAGIC_WRAPPER
/* This must match the definition for extDevTable in extract/ExtBasic.c */
char *extDevTable[] = {"fet", "mosfet", "asymmetric", "bjt", "devres",

3
extflat/EFsym.c
View File

@ -42,6 +42,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "extflat/extflat.h"
#include "extflat/EFint.h"
/* C99 compat */
#include "textio/textio.h"
/* Forward declarations */
bool efSymAdd();

3
extflat/EFvisit.c
View File

@ -37,6 +37,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "tiles/tile.h"
#include "extract/extract.h"
/* C99 compat */
#include "textio/textio.h"
/* Root of the tree being flattened */
extern Def *efFlatRootDef;
extern Use efFlatRootUse;

61
extflat/extflat.h
View File

@ -353,6 +353,67 @@ extern HierName *EFStrToHN();
extern char *EFHNToStr();
extern int EFGetPortMax();
/* C99 compat */
extern void EFHNFree();
extern bool EFHNIsGlob();
extern int EFNodeResist();
extern void efAdjustSubCap();
extern int efBuildAddStr();
extern void efBuildAttr();
extern int efBuildDevice();
extern void efBuildDeviceParams();
extern void efBuildDist();
extern void efBuildEquiv();
extern void efBuildKill();
extern void efBuildPortNode();
extern void efBuildUse();
extern int efFlatCaps();
extern int efFlatDists();
extern int efFlatKills();
extern int efFlatNodes();
extern int efFlatNodesStdCell();
extern void efFreeConn();
extern void efFreeDevTable();
extern void efFreeNodeList();
extern void efFreeNodeTable();
extern void efFreeUseTable();
extern void efHNBuildDistKey();
extern int efHNLexOrder();
extern void efHNPrintSizes();
extern void efHNRecord();
extern int efHierSrArray();
extern int efHierSrUses();
extern int efHierVisitDevs();
extern void efNodeMerge();
extern void efReadError();
extern int efReadLine();
extern bool efSymAdd();
extern bool efSymAddFile();
extern void efSymInit();
extern void EFDone();
extern void EFFlatBuild();
extern void EFFlatDone();
extern bool EFHNIsGND();
extern void EFInit();
extern bool EFReadFile();
extern int EFVisitDevs();
extern int efVisitDevs();
extern bool efSymLook();
extern int efVisitResists();
extern int EFVisitResists();
extern int EFVisitNodes();
extern int EFVisitCaps();
extern void EFGetLengthAndWidth();
extern void EFHNOut();
extern int EFHierSrDefs();
extern int EFVisitSubcircuits();
extern int EFHierVisitSubcircuits();
extern int EFHierVisitDevs();
extern int EFHierVisitResists();
extern int EFHierVisitCaps();
extern int EFHierVisitNodes();
/* ------------------------- constants used by clients -------------- */
/*

3
extract/ExtSubtree.c
View File

@ -49,6 +49,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "dbwind/dbwind.h"
#include "utils/styles.h"
/* C99 compat */
#include "drc/drc.h"
#ifdef exactinteractions
/*
* If "exactinteractions" is defined, we use an experimental algorithm

36
extract/extract.h
View File

@ -107,5 +107,41 @@ extern void ExtDumpCaps();
extern int extEnumTilePerim();
extern Plane *extPrepSubstrate();
/* C99 compat */
extern void ExtAll();
extern void ExtIncremental();
extern void ExtLengthClear();
extern void ExtParents();
extern void ExtSetDriver();
extern void ExtSetReceiver();
extern void ExtShowParents();
extern void ExtTechScale();
extern void ExtUnique();
extern void ExtractTest();
extern int ExtFindNeighbors();
extern void ExtFreeLabRegions();
extern void ExtResetTiles();
extern void extArray();
extern void extFindCoupling();
extern void extHierAdjustments();
extern void extHierConnections();
extern void extHierFreeLabels();
extern void extHierFreeOne();
extern void extHierFreeOne();
extern void extHierSubstrate();
extern int extHierYankFunc();
extern bool extLabType();
extern void extLength();
extern void extLengthInit();
extern void extOutputConns();
extern void extOutputCoupling();
extern int extPathTileDist();
extern void extRelocateSubstrateCoupling();
extern void extSetNodeNum();
extern void extShowTile();
extern void extSubtree();
extern int extUniqueCell();
extern void ExtLabelOneRegion();
extern void ExtInit();
#endif /* _EXTRACT_H */

15
extract/extractInt.h
View File

@ -1085,6 +1085,21 @@ extern NodeRegion *temp_subsnode; /* Substrate connection to subcell */
*/
extern struct stack *extNodeStack;
/* C99 compat */
extern void ExtFindInteractions();
extern void ExtInterCount();
extern void ExtInterCount();
extern void ExtTimes();
extern void ExtParentArea();
extern void extHierCopyLabels();
extern int extTimesInitFunc();
extern int extTimesHierFunc();
extern int extTimesFlatFunc();
extern Plane *extCellFile();
extern int extInterAreaFunc();
extern int extTreeSrPaintArea();
extern int extMakeUnique();
/* ------------------ Connectivity table management ------------------- */
/*

3
garouter/gaChannel.c
View File

@ -42,6 +42,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/styles.h"
#include "debug/debug.h"
/* C99 compat */
#include "gaRouter/gaInternal.h"
/* List of all active channels */
GCRChannel *gaChannelList = NULL;

12
garouter/gaInternal.h
View File

@ -96,4 +96,16 @@ typedef struct nnl
/* procedure declarations */
extern bool gaMazeInit();
/* C99 compat */
extern bool gaMazeInit();
extern void gaChannelInit();
extern void gaStemPaintAll();
extern void gaStemAssignAll();
extern bool gaStemSimpleInit();
extern bool gaStemSimpleRoute();
extern bool gaStemSimpleInit();
extern bool gaStemSimpleRoute();
extern bool gaStemSimpleRoute();
extern int gaBuildNetList();
#endif /* _GAINTERNAL_H */

4
garouter/gaMain.c
View File

@ -230,6 +230,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "debug/debug.h"
#include "drc/drc.h"
/* C99 compat */
#include "utils/netlist.h"
#include "garouter/gaInternal.h"
/*
* ----------------------------------------------------------------------------

6
garouter/garouter.h
View File

@ -97,6 +97,12 @@ extern void GAClearChannels();
extern bool GADefineChannel();
extern bool GAMazeInitParms();
/* C99 compat */
extern void GAInit();
extern void GAGenChans();
extern int GARouteCmd();
extern void GATest();
/* Exported variables */
extern bool GAStemWarn;

34
gcr/gcr.h
View File

@ -343,4 +343,38 @@ extern void GCRFlipXY();
extern void GCRNoFlip();
extern void GCRShow();
/* C99 compat */
extern void gcrSaveChannel();
extern bool gcrBlocked();
extern void gcrEvalPat();
extern void gcrLinkTrack();
extern void gcrMoveTrack();
extern int gcrNextSplit();
extern void gcrUnlinkPin();
extern bool gcrVertClear();
extern void gcrWanted();
extern void gcrBuildNets();
extern void gcrCheckCol();
extern int gcrClass();
extern void gcrCollapse();
extern int gcrDensity();
extern void gcrDumpResult();
extern void gcrFeasible();
extern void gcrInitCol();
extern void gcrInitCollapse();
extern int gcrLook();
extern void gcrMakeRuns();
extern void gcrMarkWanted();
extern void gcrPickBest();
extern void gcrPrintCol();
extern int gcrRealDist();
extern void gcrReduceRange();
extern bool gcrRiverRoute();
extern void gcrSetEndDist();
extern void gcrSetFlags();
extern void gcrShellSort();
extern int gcrTryRun();
extern void gcrUncollapse();
extern void gcrVacate();
#endif /* _GCR_H */

3
gcr/gcrRoute.c
View File

@ -31,6 +31,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/malloc.h"
#include "utils/styles.h"
/* C99 compat */
#include "router/router.h"
int gcrRouterErrors;
extern int gcrStandalone;

3
graphics/W3Dmain.c
View File

@ -50,6 +50,9 @@
#include "cif/cif.h"
#include "cif/CIFint.h" /* access to CIFPlanes, CIFCurStyle, etc. */
/* C99 compat */
#include "utils/signals.h"
extern Display *grXdpy; /* X11 display */
extern GLXContext grXcontext; /* OpenGL/X11 interface def. */
extern XVisualInfo *grVisualInfo; /* OpenGL preferred visual */

3
graphics/grDStyle.c
View File

@ -42,6 +42,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "database/database.h"
#include "dbwind/dbwind.h"
/* C99 compat */
#include "utils/main.h"
/* imports from other graphics files */
extern void (*grSetSPatternPtr)();
extern void (*grDefineCursorPtr)();

3
graphics/grMain.c
View File

@ -57,6 +57,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include <errno.h>
#include <ctype.h>
/* C99 compat */
#include <unistd.h>
#include "utils/magic.h"
#include "utils/magsgtty.h"
#include "textio/textio.h"

3
graphics/grTCairo1.c
View File

@ -46,6 +46,9 @@
#include "utils/paths.h"
#include "graphics/grTkCommon.h"
/* C99 compat */
#include "dbwind/dbwind.h"
uint8_t **grTCairoStipples;
HashTable grTCairoWindowTable;
XVisualInfo *grTCairoVisualInfo;

3
graphics/grTOGL1.c
View File

@ -44,6 +44,9 @@
#include "utils/paths.h"
#include "graphics/grTkCommon.h"
/* C99 compat */
#include "dbwind/dbwind.h"
GLubyte **grTOGLStipples;
HashTable grTOGLWindowTable;
GLXContext grXcontext;

12
graphics/grTOGL3.c
View File

@ -11,10 +11,6 @@
#include <stdio.h>
#include <string.h>
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
#include "tcltk/tclmagic.h"
#include "utils/magic.h"
#include "utils/geometry.h"
@ -31,6 +27,14 @@
#include "graphics/grTkCommon.h"
#include "database/fonts.h"
/* C99 compat
* GL headers must be included after graphics/grTOGLInt.h
*/
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
#include <GL/glext.h>
extern Display *grXdpy;
/* locals */

5
graphics/grTOGLInt.h
View File

@ -19,6 +19,11 @@
#define TOGL_BATCH_SIZE 10000
/* C99 compat
* Include OpenGL prototype headers
*/
#define GL_GLEXT_PROTOTYPES
/* Current settings for X function parameters */
typedef struct {
Tk_Font font;

3
graphics/grTk1.c
View File

@ -41,6 +41,9 @@
#include "utils/paths.h"
#include "graphics/grTkCommon.h"
/* C99 compat */
#include "dbwind/dbwind.h"
GR_CURRENT grCurrent = {
(Tk_Font)0, 0, 0, 0, 0, 0,
(MagWindow *)NULL

6
graphics/grTk3.c
View File

@ -14,6 +14,9 @@
#include <X11/Xlib.h>
/* C99 compat */
#include <X11/Xutil.h>
#include "tcltk/tclmagic.h"
#include "utils/magic.h"
#include "utils/geometry.h"
@ -29,6 +32,9 @@
#include "graphics/grTkCommon.h"
#include "database/fonts.h"
/* C99 compat */
#include "database/database.h"
/*---------------------------------------------------------
* grtkDrawGrid:

10
graphics/grTkCommon.c
View File

@ -32,6 +32,16 @@
#include "graphics/grTkCommon.h"
#include "graphics/glyphs.h"
/* C99 compat
* GL headers must be included after graphics/grTOGLInt.h
*/
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
#include <mach/mach.h> /* Needed to define panic */
#include "textio/textio.h"
/* Variables declared by grClip.c */
extern int grCurFill, grCurOutline, grCurColor;

4
graphics/grTkCommon.h
View File

@ -38,6 +38,10 @@ extern bool grtkGetBackingStore();
extern bool grtkScrollBackingStore();
extern void grtkPutBackingStore();
/* C99 compat */
extern bool grTkLoadFont();
extern void grTkFreeFonts();
extern Tk_Font grTkFonts[4];
extern Tk_Cursor grCursors[MAX_CURSORS];

11
graphics/graphics.h
View File

@ -138,6 +138,17 @@ extern void (*GrResumePtr)();
#define GrStop (*GrStopPtr)
#define GrResume (*GrResumePtr)
/* C99 compat */
extern void GrClipTriangle();
extern void GrBox();
extern bool GrFontText();
extern void GrDiagonal();
extern bool grTkLoadFont();
extern void grTkFreeFonts();
extern bool grtoglLoadFont();
extern void GrDrawTriangleEdge();
extern bool GrReadGlyphs();
/* Number of colors defined in the colormap */
extern int GrNumColors;

5
graphics/graphicsInt.h
View File

@ -89,4 +89,9 @@ extern void grInformDriver();
(((x) >> SUBPIXELBITS) < 4) || (((y) >> SUBPIXELBITS) < 4) \
)
/* C99 compat */
extern bool GrReadGlyphs();
extern bool GrBoxOutline();
extern bool grtcairoLoadFont();
#endif /* _GRAPHICSINT_H */

35
grouter/grouter.h
View File

@ -237,6 +237,41 @@ GlPoint *glProcessLoc();
Tile *glChanPinToTile();
void glCrossMark();
/* C99 compat */
extern void GlGlobalRoute();
extern void GlInit();
extern void dbSetPlaneTile();
extern void glChanBlockDens();
extern void glChanBuildMap();
extern void glChanFreeMap();
extern int glCrossCost();
extern int glCrossEnum();
extern void glCrossScalePenalties();
extern void glCrossUnreserve();
extern void glDMAlloc();
extern void glDMCopy();
extern void glDMFree();
extern int glDMMaxInRange();
extern bool glDensAdjust();
extern void glDensInit();
extern void glHistoAdd();
extern void glListAdd();
extern void glListToHeap();
extern void glMazeResetCost();
extern int glMultiSteiner();
extern int glMultiStemCost();
extern int glPathFreePerm();
extern void glPathFreeTemp();
extern int glPenClearPerChan();
extern void glPenCompute();
extern int glPenDeleteNet();
extern void glPenSetPerChan();
extern void glShowCross();
extern void glStatsDone();
extern void glStatsInit();
extern int glPenEnumCross();
extern void GlTest();
/* Penalties for crossings */
extern int glJogPenalty;
extern int glObsPenalty1;

5
irouter/irRoute.c
View File

@ -44,10 +44,13 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/geofast.h"
#include "utils/touchingtypes.h"
#include "select/select.h"
#include "../mzrouter/mzrouter.h"
#include "mzrouter/mzrouter.h"
#include "irouter/irouter.h"
#include "irouter/irInternal.h"
/* C99 compat */
#include "select/select.h"
/* --- Routines local to this file that are referenced before they are
* defined --- */
List *irChooseEndPtLayers();

5
irouter/irTestCmd.c
View File

@ -43,9 +43,12 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/styles.h"
#include "utils/malloc.h"
#include "utils/list.h"
#include "../mzrouter/mzrouter.h"
#include "mzrouter/mzrouter.h"
#include "irouter/irInternal.h"
/* C99 compat */
#include "debug/debug.h"
/* Subcommand table - declared here since its referenced before defined */
typedef struct
{

4
irouter/irouter.h
View File

@ -49,4 +49,8 @@ extern bool IRTechLine();
extern void IRDRCInit();
extern bool IRDRCLine();
/* C99 compat */
extern int irRoute();
extern void IRCommand();
#endif /* _IROUTER_H */

4
lef/defRead.c
View File

@ -36,6 +36,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "cif/cif.h"
#include "lef/lefInt.h"
/* C99 compat */
#include "textio/textio.h"
#include "commands/commands.h"
/*
*------------------------------------------------------------
*

4
lef/defWrite.c
View File

@ -33,6 +33,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "lef/lefInt.h"
#include "drc/drc.h" /* for querying width,spacing rules */
/* C99 compat */
#include "utils/signals.h"
#include "textio/textio.h"
/*----------------------------------------------------------------------*/
/* Structures used by various routines */
/*----------------------------------------------------------------------*/

5
lef/lefCmd.c
View File

@ -27,6 +27,11 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "textio/txcommands.h"
#include "commands/commands.h"
/* C99 compat */
#include "textio/textio.h"
#include "cif/cif.h"
#include "lef/lefInt.h"
int lefDateStamp = -1; /* If not -1, defines the timestamp to use when creating
* new cell defs from LEF or DEF. Useful when generating
* libraries to make sure that full and abstract views of

11
lef/lefInt.h
View File

@ -157,6 +157,17 @@ LefMapping *defMakeInverseLayerMap();
void LefError(int, char *, ...); /* Variable argument procedure requires */
/* parameter list. */
/* C99 compat */
extern void LefRead();
extern void DefRead();
void LefWriteAll();
void DefWriteCell();
void LefWriteCell();
int DRCGetDefaultLayerWidth();
void LefTechInit();
void lefRemoveGeneratedVias();
/* Definitions for type passed to LefError() */
#define LEF_ERROR 0

6
lef/lefRead.c
View File

@ -44,6 +44,12 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "cif/CIFread.h" /* Access to cifCurReadStyle. . . */
#include "lef/lefInt.h"
/* C99 compat */
#include "utils/signals.h"
#include "utils/signals.h"
#include "drc/drc.h"
#include "lef/lef.h"
/* ---------------------------------------------------------------------*/
/* Current line number for reading */

3
lef/lefTech.c
View File

@ -39,6 +39,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header$";
#include "drc/drc.h"
#include "cif/cif.h"
/* C99 compat */
#include "utils/tech.h"
/* ---------------------------------------------------------------------*/
/* Layer and Via routing information table. */

4
lef/lefWrite.c
View File

@ -44,6 +44,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header$";
#include "cif/CIFint.h"
#include "lef/lefInt.h"
/* C99 compat */
#include "textio/textio.h"
#include "select/select.h"
#define FP "%s"
#define POINT FP " " FP

3
magic/magicTop.c
View File

@ -30,6 +30,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/magic.h"
#include "utils/malloc.h"
/* C99 compat */
#include "utils/main.h"
/*---------------------------------------------------------------------------
* main:
*

21
mzrouter/mzInternal.h
View File

@ -432,6 +432,27 @@ extern dlong mzWindowMaxToGo;
/* Marked cell list */
extern List *mzMarkedCellsList;
/* C99 compat */
extern void mzExtendBlockBounds();
extern void mzBuildDestAreaBlocks();
extern void mzBuildEstimate();
extern void mzBuildHFR();
extern void mzCleanEstimate();
extern void mzComputeDerivedParms();
extern void mzDumpEstimates();
extern void mzDumpTags();
extern void mzExtendDown();
extern void mzExtendLeft();
extern void mzExtendRight();
extern void mzExtendUp();
extern void mzFreeAllRPaths();
extern void mzMarkConnectedTiles();
extern void mzPaintBlockType();
extern void mzPrintPathHead();
extern bool mzStart();
extern void mzWalkLRContact();
extern void mzWalkUDContact();
/* ------------ Interesting Point Macros -------------------------------- */
/* The following macros are used in the low-level routines for finding
* the NEXT interesting point to the Right, Left, Up and Down.

3
mzrouter/mzTech.c
View File

@ -45,6 +45,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "mzrouter/mzrouter.h"
#include "mzrouter/mzInternal.h"
/* C99 compat */
#include "drc/drc.h"
/* Procedures referenced before they are defined
* (these procedures are local to this file)
*/

3
mzrouter/mzTestCmd.c
View File

@ -47,6 +47,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "mzrouter/mzrouter.h"
#include "mzrouter/mzInternal.h"
/* C99 compat */
#include "debug/debug.h"
/* Subcommand table - declared here since its referenced before defined */
typedef struct
{

3
netmenu/NMwiring.c
View File

@ -43,6 +43,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "router/router.h"
#include "utils/utils.h"
/* C99 compat */
#include "select/select.h"
/* The following structure is used to hold information about
* areas to be erased during net ripup.
*/

4
netmenu/netmenu.h
View File

@ -56,4 +56,8 @@ extern void NMButtonRight();
extern void NMMeasureAll();
#endif
/* C99 compat */
extern void nmGetNums();
#endif /* _NETMENU_H */

9
netmenu/nmInt.h
View File

@ -128,6 +128,15 @@ extern void NMWriteAll();
extern void NMUndo();
extern void NMUndoInit();
/* C99 compat */
extern void NMMeasureNet();
extern int NMcommand();
extern int NMredisplay();
extern int NMCull();
extern bool CmdParseLayers();
extern int NMredisplay();
extern int NMEnumTerms();
/* Various global variables (within this module): */
extern char * NMCurNetName;

3
plot/plotCmd.c
View File

@ -41,6 +41,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "commands/commands.h"
#include "plot/plotInt.h"
/* C99 compat */
#include "textio/textio.h"
/*
* ----------------------------------------------------------------------------

3
plot/plotHP.c
View File

@ -15,6 +15,9 @@
#include "utils/malloc.h"
#include "plot/plotInt.h"
/* C99 compat */
#include "textio/textio.h"
#ifdef VERSATEC
extern int PlotRTLCompress();

15
plot/plotInt.h
View File

@ -235,4 +235,19 @@ extern unsigned char PlotPNMBG;
extern bool PlotPNMRTL;
#endif
/* C99 compat */
extern void PlotRastFatLine();
extern void PlotHPRTLHeader();
extern void PlotPS();
extern void PlotHPGL2Header();
extern void PlotPrintParams();
extern int PlotDumpHPRTL();
extern void PlotHPGL2Trailer();
extern void PlotSetParam();
extern void PlotHPRTLTrailer();
extern void PlotVersatec();
extern void PlotPNM();
extern void PlotPNM();
extern int PlotRTLCompress();
#endif /* _PLOTINT_H */

3
plot/plotPNM.c
View File

@ -36,6 +36,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include <string.h>
#include <math.h>
/* C99 compat */
#include <stdlib.h>
#include "utils/magic.h"
#include "utils/geometry.h"
#include "utils/geofast.h"

3
plot/plotPS.c
View File

@ -38,6 +38,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "dbwind/dbwind.h"
#include "textio/textio.h"
/* C99 compat */
#include "graphics/graphics.h"
/* Records of the following type are used to describe how to generate
* PS output for a particular set of mask layers. Each style
* describes the PS figures to draw for a particular set of

6
plot/plotVers.c
View File

@ -24,6 +24,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include <stdio.h>
#include <string.h>
/* C99 compat */
#include <stdlib.h>
#include "utils/magic.h"
#include "utils/geometry.h"
#include "utils/geofast.h"
@ -41,6 +44,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "dbwind/dbwind.h"
#include "cif/cif.h" /* for CIFGetOutputScale() */
/* C99 compat */
#include "plot/plotInt.h"
#ifdef VERSATEC
/* Library imports: */

5
plow/PlowCmd.c
View File

@ -38,6 +38,11 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "plow/plow.h"
#include "select/select.h"
/* C99 compat */
#include "textio/textio.h"
#include "commands/commands.h"
#include "plow/plowInt.h"
/*
* ----------------------------------------------------------------------------
*

3
plow/PlowRandom.c
View File

@ -45,6 +45,9 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "utils/signals.h"
#include "extract/extract.h"
/* C99 compat */
#include "drc/drc.h"
/* Imports from PlowMain.c */
extern CellDef *plowYankDef;

4
plow/PlowTech.c
View File

@ -36,6 +36,10 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
#include "plow/plowInt.h"
#include "drc/drc.h"
/* C99 compat */
#include "utils/tech.h"
#include "drc/drc.h"
/* Imports from DRC */
extern char *maskToPrint();

5
plow/plow.h
View File

@ -54,4 +54,9 @@ extern int PlowJogHorizon;
/* TRUE if we should eliminate jogs after each plow operation */
extern bool PlowDoStraighten;
/* C99 compat */
extern void DRCPlowScale();
extern void PlowInit();
extern void PlowAfterTech();
#endif /* _PLOW_H */

33
plow/plowInt.h
View File

@ -247,6 +247,39 @@ extern bool plowQueueLeftmost();
extern bool plowQueueRightmost();
extern Tile *plowSplitY();
/* C99 compat */
extern bool Plow();
extern void PlowClearBound();
extern bool PlowSelection();
extern void PlowSetBound();
extern void PlowStraighten();
extern int plowApplySearchRules();
extern int plowAtomize();
extern void plowCleanupJogs();
extern void plowDebugEdge();
extern int plowFindWidth();
extern int plowFindWidthBack();
extern int plowGenRandom();
extern void plowQueueDone();
extern void plowQueueInit();
extern int plowSrFinalArea();
extern void plowSrOutline();
extern int plowSrShadow();
extern int plowSrShadowBack();
extern int plowSrShadowInitial();
extern bool plowYankMore();
extern void PlowRandomTest();
extern void plowDebugInit();
extern void plowMergeBottom();
extern void plowMergeTop();
extern void plowMoveEdge();
extern int plowShadowInitialRHS();
extern int plowShadowLHS();
extern int plowShadowRHS();
extern void plowTechShow();
extern void plowUpdateLabels();
extern void plowYankCreate();
/* ------------------------- Debugging flags -------------------------- */
/*

Some files were not shown because too many files have changed in this diff Show More