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.

calma/CalmaRdcl.c

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

calma/CalmaRdio.c

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

calma/CalmaRdpt.c

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

calma/CalmaRead.c

@@ -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 */

calma/CalmaWrite.c

@@ -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 */

calma/CalmaWriteZ.c

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

calma/calma.h

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

cif/CIFgen.c

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

cif/CIFint.h

@@ -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. */

cif/CIFrdpt.c

@@ -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"
 
 /*
  * ----------------------------------------------------------------------------

cif/CIFrdtech.c

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

cif/CIFrdutils.c

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

cif/CIFsee.c

@@ -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.
  */

cif/CIFtech.c

@@ -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.
  */

cif/cif.h

@@ -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 */

cmwind/cmwind.h

@@ -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 */

commands/CmdCD.c

@@ -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.
  */

commands/CmdE.c

@@ -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"
+
 
 /*
  * ----------------------------------------------------------------------------

commands/CmdFI.c

@@ -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.
  */

commands/CmdLQ.c

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

commands/CmdRS.c

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

commands/CmdTZ.c

@@ -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 */

commands/CmdWizard.c

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

commands/commands.h

@@ -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 */

database/DBcellcopy.c

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

database/DBconnect.c

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

database/DBio.c

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