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

rename Region to ExtRegion 

On Macos, Tk includes X11, which has this define:

    #if !defined(MAC_OSX_TK)
    #   include <X11/X.h>
    #endif
    #ifdef MAC_OSX_TK
    #   include <X11/X.h>
    #   define Cursor XCursor
    #   define Region XRegion
    #endif

This causes the keywords `Cursor` and `Region` to be reserved, which
prevents magic from building.

Rename `Region` to `ExtRegion` as suggested by @RTimothyEdwards in
https://github.com/RTimothyEdwards/magic/issues/195#issuecomment-1298870983
and https://github.com/RTimothyEdwards/magic/pull/222#pullrequestreview-1334900670

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2023-02-24 10:27:08 +08:00 committed by Tim Edwards
parent 5e5879c53d
commit 1e7da74672
14 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extract/ExtArray.c
View File

@ -734,7 +734,7 @@ extArrayNodeName(np, ha, et1, et2)
* The node associated with a tile can be determined in one of the * The node associated with a tile can be determined in one of the
* following ways: * following ways:
* *
* (1) Look for a label on the list of the Region pointed to by the * (1) Look for a label on the list of the ExtRegion pointed to by the
* tile planes of 'et->et_use->cu_def'. If no label was found, * tile planes of 'et->et_use->cu_def'. If no label was found,
* then try (2). * then try (2).
* *

32
extract/ExtBasic.c
View File

@ -173,7 +173,7 @@ extFoundFunc(tile, cxp)
* file 'outFile'. * file 'outFile'.
* *
* Results: * Results:
* Returns a list of Region structs that comprise all * Returns a list of ExtRegion structs that comprise all
* the nodes in 'def'. It is the caller's responsibility * the nodes in 'def'. It is the caller's responsibility
* to call ExtResetTile() and ExtFreeLabRegions() to restore * to call ExtResetTile() and ExtFreeLabRegions() to restore
* the CellDef to its original state and to free the list * the CellDef to its original state and to free the list
@ -191,7 +191,7 @@ extFoundFunc(tile, cxp)
* device * device
* *
* Interruptible in a limited sense. We will still return a * Interruptible in a limited sense. We will still return a
* Region list, but labels may not have been assigned, and * ExtRegion list, but labels may not have been assigned, and
* nodes and fets may not have been output. * nodes and fets may not have been output.
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
@ -260,7 +260,7 @@ extBasic(def, outFile)
/* /*
* Build up a list of the electrical nodes (equipotentials) * Build up a list of the electrical nodes (equipotentials)
* for extOutputNodes() below. For this, we definitely want * for extOutputNodes() below. For this, we definitely want
* to leave each tile pointing to its associated Region struct. * to leave each tile pointing to its associated ExtRegion struct.
* Compute resistance and capacitance on the fly. * Compute resistance and capacitance on the fly.
* Use a special-purpose version of ExtFindRegions for speed. * Use a special-purpose version of ExtFindRegions for speed.
*/ */
@ -1858,13 +1858,13 @@ extOutputDevices(def, transList, outFile)
/* Mark with reg and process each perimeter segment */ /* Mark with reg and process each perimeter segment */
arg.fra_uninit = (ClientData) extTransRec.tr_gatenode; arg.fra_uninit = (ClientData) extTransRec.tr_gatenode;
arg.fra_region = (Region *) reg; arg.fra_region = (ExtRegion *) reg;
arg.fra_each = extTransTileFunc; arg.fra_each = extTransTileFunc;
ntiles = ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg); ntiles = ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg);
/* Re-mark with extTransRec.tr_gatenode */ /* Re-mark with extTransRec.tr_gatenode */
arg.fra_uninit = (ClientData) reg; arg.fra_uninit = (ClientData) reg;
arg.fra_region = (Region *) extTransRec.tr_gatenode; arg.fra_region = (ExtRegion *) extTransRec.tr_gatenode;
arg.fra_each = (int (*)()) NULL; arg.fra_each = (int (*)()) NULL;
(void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg); (void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg);
@ -2158,7 +2158,7 @@ extOutputDevices(def, transList, outFile)
/* Mark with reg and process each perimeter segment */ /* Mark with reg and process each perimeter segment */
arg.fra_uninit = (ClientData) extTransRec.tr_gatenode; arg.fra_uninit = (ClientData) extTransRec.tr_gatenode;
arg.fra_region = (Region *) reg; arg.fra_region = (ExtRegion *) reg;
arg.fra_each = extAnnularTileFunc; arg.fra_each = extAnnularTileFunc;
(void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg); (void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg);
@ -2178,7 +2178,7 @@ extOutputDevices(def, transList, outFile)
/* Re-mark with extTransRec.tr_gatenode */ /* Re-mark with extTransRec.tr_gatenode */
arg.fra_uninit = (ClientData) reg; arg.fra_uninit = (ClientData) reg;
arg.fra_region = (Region *) extTransRec.tr_gatenode; arg.fra_region = (ExtRegion *) extTransRec.tr_gatenode;
arg.fra_each = (int (*)()) NULL; arg.fra_each = (int (*)()) NULL;
(void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg); (void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg);
@ -2240,7 +2240,7 @@ extOutputDevices(def, transList, outFile)
/* Mark with reg and process each perimeter segment */ /* Mark with reg and process each perimeter segment */
arg.fra_uninit = (ClientData) extTransRec.tr_gatenode; arg.fra_uninit = (ClientData) extTransRec.tr_gatenode;
arg.fra_region = (Region *) reg; arg.fra_region = (ExtRegion *) reg;
if (isAnnular) if (isAnnular)
arg.fra_each = extAnnularTileFunc; arg.fra_each = extAnnularTileFunc;
else else
@ -2276,7 +2276,7 @@ extOutputDevices(def, transList, outFile)
/* Re-mark with extTransRec.tr_gatenode */ /* Re-mark with extTransRec.tr_gatenode */
arg.fra_uninit = (ClientData) reg; arg.fra_uninit = (ClientData) reg;
arg.fra_region = (Region *) extTransRec.tr_gatenode; arg.fra_region = (ExtRegion *) extTransRec.tr_gatenode;
arg.fra_each = (int (*)()) NULL; arg.fra_each = (int (*)()) NULL;
(void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg); (void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg);
} }
@ -2378,7 +2378,7 @@ extOutputDevices(def, transList, outFile)
/* Mark with reg and process each perimeter segment */ /* Mark with reg and process each perimeter segment */
arg.fra_uninit = (ClientData) extTransRec.tr_gatenode; arg.fra_uninit = (ClientData) extTransRec.tr_gatenode;
arg.fra_region = (Region *) reg; arg.fra_region = (ExtRegion *) reg;
arg.fra_each = extAnnularTileFunc; arg.fra_each = extAnnularTileFunc;
(void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg); (void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg);
@ -2395,7 +2395,7 @@ extOutputDevices(def, transList, outFile)
/* Re-mark with extTransRec.tr_gatenode */ /* Re-mark with extTransRec.tr_gatenode */
arg.fra_uninit = (ClientData) reg; arg.fra_uninit = (ClientData) reg;
arg.fra_region = (Region *) extTransRec.tr_gatenode; arg.fra_region = (ExtRegion *) extTransRec.tr_gatenode;
arg.fra_each = (int (*)()) NULL; arg.fra_each = (int (*)()) NULL;
(void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg); (void) ExtFindNeighbors(reg->treg_tile, arg.fra_pNum, &arg);
} }
@ -3893,7 +3893,7 @@ extSetNodeNum(reg, plane, tile)
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
Region * ExtRegion *
extTransFirst(tile, arg) extTransFirst(tile, arg)
Tile *tile; Tile *tile;
FindRegion *arg; FindRegion *arg;
@ -3914,8 +3914,8 @@ extTransFirst(tile, arg)
/* Prepend it to the region list */ /* Prepend it to the region list */
reg->treg_next = (TransRegion *) arg->fra_region; reg->treg_next = (TransRegion *) arg->fra_region;
arg->fra_region = (Region *) reg; arg->fra_region = (ExtRegion *) reg;
return ((Region *) reg); return ((ExtRegion *) reg);
} }
/*ARGSUSED*/ /*ARGSUSED*/
@ -3998,7 +3998,7 @@ extFindNodes(def, clipArea, subonly)
extNodeStack = StackNew(64); extNodeStack = StackNew(64);
arg.fra_def = def; arg.fra_def = def;
arg.fra_region = (Region *) NULL; arg.fra_region = (ExtRegion *) NULL;
SigDisableInterrupts(); SigDisableInterrupts();
@ -4244,7 +4244,7 @@ extNodeAreaFunc(tile, arg)
/* Prepend the new node to the region list */ /* Prepend the new node to the region list */
reg->nreg_next = (NodeRegion *) arg->fra_region; reg->nreg_next = (NodeRegion *) arg->fra_region;
arg->fra_region = (Region *) reg; arg->fra_region = (ExtRegion *) reg;
/* Used by substrate generating routine */ /* Used by substrate generating routine */
if (tile == NULL) return 1; if (tile == NULL) return 1;

2
extract/ExtCell.c
View File

@ -248,7 +248,7 @@ extFileOpen(def, file, mode, doLocal, prealfile)
* a cell on the plane representing the substrate to determine if the area is * a cell on the plane representing the substrate to determine if the area is
* the default substrate or an isolated region. If an isolated region, it * the default substrate or an isolated region. If an isolated region, it
* must be painted with a tile type so that the extraction code can tag the * must be painted with a tile type so that the extraction code can tag the
* tiles with a Region and assign it a node. This code creates the substrate * tiles with a ExtRegion and assign it a node. This code creates the substrate
* paint in the isolated regions for the duration of the extration, then * paint in the isolated regions for the duration of the extration, then
* reverts back to the original plane afterward. * reverts back to the original plane afterward.
* *

14
extract/ExtHard.c
View File

@ -70,7 +70,7 @@ bool extHardSetLabel();
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
Region * ExtRegion *
extLabFirst(tile, arg) extLabFirst(tile, arg)
Tile *tile; Tile *tile;
FindRegion *arg; FindRegion *arg;
@ -85,8 +85,8 @@ extLabFirst(tile, arg)
/* Prepend it to the region list */ /* Prepend it to the region list */
reg->treg_next = (TransRegion *) arg->fra_region; reg->treg_next = (TransRegion *) arg->fra_region;
arg->fra_region = (Region *) reg; arg->fra_region = (ExtRegion *) reg;
return ((Region *) reg); return ((ExtRegion *) reg);
} }
/*ARGSUSED*/ /*ARGSUSED*/
@ -211,7 +211,7 @@ extHardProc(scx, arg)
* If labels are being generated automatically on this pass, * If labels are being generated automatically on this pass,
* we don't bother to assign labels to geometry. Instead, we * we don't bother to assign labels to geometry. Instead, we
* construct a new label based on the lower-leftmost tile in * construct a new label based on the lower-leftmost tile in
* the Region labRegList. * the ExtRegion labRegList.
*/ */
if (arg->hw_autogen) if (arg->hw_autogen)
{ {
@ -300,7 +300,7 @@ extHardSetLabel(scx, reg, arg)
* coordinates in the def scx->scx_use->cu_def * coordinates in the def scx->scx_use->cu_def
* up to root coordinates. * up to root coordinates.
*/ */
TransRegion *reg; /* Region with a label list */ TransRegion *reg; /* ExtRegion with a label list */
HardWay *arg; /* We will set arg->hw_label if a node HardWay *arg; /* We will set arg->hw_label if a node
* label is found on the label list of 'reg'. * label is found on the label list of 'reg'.
*/ */
@ -414,7 +414,7 @@ extHardGenerateLabel(scx, reg, arg)
* generated label's coordinates up to * generated label's coordinates up to
* root coordinates. * root coordinates.
*/ */
TransRegion *reg; /* Region whose treg_ll and treg_pnum we use TransRegion *reg; /* ExtRegion whose treg_ll and treg_pnum we use
* to generate a new label name. * to generate a new label name.
*/ */
HardWay *arg; /* We set arg->hw_label to the new label */ HardWay *arg; /* We set arg->hw_label to the new label */
@ -493,7 +493,7 @@ extHardFreeAll(def, tReg)
arg.fra_connectsTo = ExtCurStyle->exts_nodeConn; arg.fra_connectsTo = ExtCurStyle->exts_nodeConn;
arg.fra_def = def; arg.fra_def = def;
arg.fra_each = (int (*)()) NULL; arg.fra_each = (int (*)()) NULL;
arg.fra_region = (Region *) extUnInit; arg.fra_region = (ExtRegion *) extUnInit;
for (reg = tReg; reg; reg = reg->treg_next) for (reg = tReg; reg; reg = reg->treg_next)
{ {

6
extract/ExtHier.c
View File

@ -941,7 +941,7 @@ extHierNewNode(he)
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
Region * ExtRegion *
extHierLabFirst(tile, arg) extHierLabFirst(tile, arg)
Tile *tile; Tile *tile;
FindRegion *arg; FindRegion *arg;
@ -955,9 +955,9 @@ extHierLabFirst(tile, arg)
/* Prepend it to the region list */ /* Prepend it to the region list */
new->lreg_next = (LabRegion *) arg->fra_region; new->lreg_next = (LabRegion *) arg->fra_region;
arg->fra_region = (Region *) new; arg->fra_region = (ExtRegion *) new;
return ((Region *) new); return ((ExtRegion *) new);
} }
/*ARGSUSED*/ /*ARGSUSED*/

32
extract/ExtRegion.c
View File

@ -46,11 +46,11 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
* Two procedures are supplied by the caller, 'first' and 'each'. * Two procedures are supplied by the caller, 'first' and 'each'.
* *
* The function 'first' must be non-NULL. It is called for each tile * The function 'first' must be non-NULL. It is called for each tile
* tile found in the region. It must return a pointer to a Region * tile found in the region. It must return a pointer to a ExtRegion
* struct (or one of the client forms of a Region struct; see the * struct (or one of the client forms of a ExtRegion struct; see the
* comments in extractInt.h). * comments in extractInt.h).
* *
* Region * * ExtRegion *
* (*first)(tile, arg) * (*first)(tile, arg)
* Tile *tile; /# Tile is on plane arg->fra_pNum #/ * Tile *tile; /# Tile is on plane arg->fra_pNum #/
* FindRegion *arg; * FindRegion *arg;
@ -69,13 +69,13 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
* *
* Results: * Results:
* Returns a pointer to the first element in the linked list * Returns a pointer to the first element in the linked list
* of Region structures for this CellDef. The Region structs * of ExtRegion structures for this CellDef. The ExtRegion structs
* may in fact contain more than the basic Region struct; this * may in fact contain more than the basic ExtRegion struct; this
* will depend on what the function 'first' allocates. * will depend on what the function 'first' allocates.
* *
* Side effects: * Side effects:
* Each non-space tile has its ti_client field left pointing * Each non-space tile has its ti_client field left pointing
* to a Region structure that describes the region that tile * to a ExtRegion structure that describes the region that tile
* belongs to. * belongs to.
* *
* Non-interruptible. It is the caller's responsibility to check * Non-interruptible. It is the caller's responsibility to check
@ -84,7 +84,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
Region * ExtRegion *
ExtFindRegions(def, area, mask, connectsTo, uninit, first, each) ExtFindRegions(def, area, mask, connectsTo, uninit, first, each)
CellDef *def; /* Cell definition being searched */ CellDef *def; /* Cell definition being searched */
Rect *area; /* Area to search initially for tiles */ Rect *area; /* Area to search initially for tiles */
@ -104,7 +104,7 @@ ExtFindRegions(def, area, mask, connectsTo, uninit, first, each)
ClientData uninit; /* Contents of a ti_client field indicating ClientData uninit; /* Contents of a ti_client field indicating
* that the tile has not yet been visited. * that the tile has not yet been visited.
*/ */
Region * (*first)(); /* Applied to first tile in region */ ExtRegion * (*first)(); /* Applied to first tile in region */
int (*each)(); /* Applied to each tile in region */ int (*each)(); /* Applied to each tile in region */
{ {
FindRegion arg; FindRegion arg;
@ -116,7 +116,7 @@ ExtFindRegions(def, area, mask, connectsTo, uninit, first, each)
arg.fra_uninit = uninit; arg.fra_uninit = uninit;
arg.fra_first = first; arg.fra_first = first;
arg.fra_each = each; arg.fra_each = each;
arg.fra_region = (Region *) NULL; arg.fra_region = (ExtRegion *) NULL;
/* Make sure temp_subsnode is NULL */ /* Make sure temp_subsnode is NULL */
temp_subsnode = NULL; temp_subsnode = NULL;
@ -140,7 +140,7 @@ ExtFindRegions(def, area, mask, connectsTo, uninit, first, each)
* equal to arg->fra_uninit are visited. * equal to arg->fra_uninit are visited.
* *
* We call 'fra_first' to allocate a new region struct for it, and then * We call 'fra_first' to allocate a new region struct for it, and then
* prepend it to the Region list (Region *) arg->fra_clientData. We * prepend it to the ExtRegion list (ExtRegion *) arg->fra_clientData. We
* then call ExtFindNeighbors to trace out recursively all the remaining * then call ExtFindNeighbors to trace out recursively all the remaining
* tiles in the region. * tiles in the region.
* *
@ -148,7 +148,7 @@ ExtFindRegions(def, area, mask, connectsTo, uninit, first, each)
* Always returns 0, to cause DBSrPaintClient to continue its search. * Always returns 0, to cause DBSrPaintClient to continue its search.
* *
* Side effects: * Side effects:
* Allocates a new Region struct if the tile has not yet been visited. * Allocates a new ExtRegion struct if the tile has not yet been visited.
* See also the comments for ExtFindNeighbors. * See also the comments for ExtFindNeighbors.
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
@ -425,7 +425,7 @@ ExtLabelOneRegion(def, connTo, reg)
* *
* Side effects: * Side effects:
* All the non-space tiles in the CellDef have their ti_client * All the non-space tiles in the CellDef have their ti_client
* fields set back to uninitialized. Does not free the Region * fields set back to uninitialized. Does not free the ExtRegion
* structs that these tiles point to; that must be done by * structs that these tiles point to; that must be done by
* ExtFreeRegions, ExtFreeLabRegions, or ExtFreeHierLabRegions. * ExtFreeRegions, ExtFreeLabRegions, or ExtFreeHierLabRegions.
* *
@ -470,9 +470,9 @@ ExtResetTiles(def, resetTo)
void void
ExtFreeRegions(regList) ExtFreeRegions(regList)
Region *regList; /* List of regions to be freed */ ExtRegion *regList; /* List of regions to be freed */
{ {
Region *reg; ExtRegion *reg;
for (reg = regList; reg; reg = reg->reg_next) for (reg = regList; reg; reg = reg->reg_next)
freeMagic((char *) reg); freeMagic((char *) reg);
@ -495,9 +495,9 @@ ExtFreeLabRegions(regList)
void void
ExtFreeHierLabRegions(regList) ExtFreeHierLabRegions(regList)
Region *regList; /* List of regions to be freed */ ExtRegion *regList; /* List of regions to be freed */
{ {
Region *reg; ExtRegion *reg;
LabelList *ll; LabelList *ll;
for (reg = regList; reg; reg = reg->reg_next) for (reg = regList; reg; reg = reg->reg_next)

2
extract/ExtSubtree.c
View File

@ -950,7 +950,7 @@ extSubstrateFunc(scx, ha)
* The node associated with a tile can be determined in one of the * The node associated with a tile can be determined in one of the
* following ways: * following ways:
* *
* (1) Look for a label on the list of the Region pointed to by the * (1) Look for a label on the list of the ExtRegion pointed to by the
* tile planes of the yank buffer. If no label was found, then * tile planes of the yank buffer. If no label was found, then
* try (2). * try (2).
* *

24
extract/extractInt.h
View File

@ -132,7 +132,7 @@ typedef struct ll
* The following are the structures built up by the various * The following are the structures built up by the various
* clients of ExtFindRegions. The general rule for these * clients of ExtFindRegions. The general rule for these
* structures is that their initial fields must be identical * structures is that their initial fields must be identical
* to those in a Region, but subsequent fields are up to * to those in a ExtRegion, but subsequent fields are up to
* the individual client. * the individual client.
* *
* Regions marked as GENERIC are the types accepted by * Regions marked as GENERIC are the types accepted by
@ -140,8 +140,8 @@ typedef struct ll
*/ */
/* /*
* GENERIC Region struct. * GENERIC ExtRegion struct.
* All this provides is a pointer to the next Region. * All this provides is a pointer to the next ExtRegion.
* This is the type passed to functions like ExtFreeRegions, * This is the type passed to functions like ExtFreeRegions,
* and is the type returned by ExtFindRegions. Clients should * and is the type returned by ExtFindRegions. Clients should
* cast pointers of this type to their own, client type. * cast pointers of this type to their own, client type.
@ -149,7 +149,7 @@ typedef struct ll
typedef struct reg typedef struct reg
{ {
struct reg *reg_next; /* Next region in list */ struct reg *reg_next; /* Next region in list */
} Region; } ExtRegion;
/* /*
* GENERIC region with labels. * GENERIC region with labels.
@ -253,9 +253,9 @@ typedef struct
* field of a tile if it's not yet * field of a tile if it's not yet
* been visited. * been visited.
*/ */
Region *(*fra_first)(); /* Function to init new region */ ExtRegion *(*fra_first)(); /* Function to init new region */
int (*fra_each)(); /* Function for each tile in region */ int (*fra_each)(); /* Function for each tile in region */
Region *fra_region; /* Ptr to Region struct for current ExtRegion *fra_region; /* Ptr to ExtRegion struct for current
* region. May be set by fra_first * region. May be set by fra_first
* and used by fra_each. * and used by fra_each.
*/ */
@ -1027,16 +1027,16 @@ extern ClientData extUnInit;
STACKPUSH((ClientData)(pointertype)(pl | TT_SIDE), extNodeStack); \ STACKPUSH((ClientData)(pointertype)(pl | TT_SIDE), extNodeStack); \
STACKPUSH((ClientData)(pointertype)tp, extNodeStack) STACKPUSH((ClientData)(pointertype)tp, extNodeStack)
/* ------------------------- Region finding --------------------------- */ /* ------------------------- ExtRegion finding --------------------------- */
extern Region *ExtFindRegions(); extern ExtRegion *ExtFindRegions();
extern LabelList *ExtLabelRegions(); extern LabelList *ExtLabelRegions();
/* Filter functions for ExtFindRegions() */ /* Filter functions for ExtFindRegions() */
extern Region *extTransFirst(); extern int extTransEach(); extern ExtRegion *extTransFirst(); extern int extTransEach();
extern Region *extResFirst(); extern int extResEach(); extern ExtRegion *extResFirst(); extern int extResEach();
extern Region *extNodeFirst(); extern int extNodeEach(); extern ExtRegion *extNodeFirst(); extern int extNodeEach();
extern Region *extHierLabFirst(); extern int extHierLabEach(); extern ExtRegion *extHierLabFirst(); extern int extHierLabEach();
extern Tile *extNodeToTile(); extern Tile *extNodeToTile();

2
plot/plotPNM.c
View File

@ -823,7 +823,7 @@ PlotPNM(fileName, scx, layers, xMask, width)
TxPrintf ("PNM image dimensions: %d x %d\n", im_x, im_y); TxPrintf ("PNM image dimensions: %d x %d\n", im_x, im_y);
#if 0 #if 0
TxPrintf ("Region size: %d x %d\n", tile_xsize, tile_ysize); TxPrintf ("ExtRegion size: %d x %d\n", tile_xsize, tile_ysize);
TxPrintf ("Pixels per region: %d\n", y_pixels); TxPrintf ("Pixels per region: %d\n", y_pixels);
TxPrintf ("Scale: %g\n", scale); TxPrintf ("Scale: %g\n", scale);
TxPrintf ("Antialiasing overlap: %d\n", scale_over_2); TxPrintf ("Antialiasing overlap: %d\n", scale_over_2);

2
readline/readline-4.3/text.c
View File

@ -1496,7 +1496,7 @@ rl_backward_char_search (count, key)
/* **************************************************************** */ /* **************************************************************** */
/* */ /* */
/* The Mark and the Region. */ /* The Mark and the ExtRegion. */
/* */ /* */
/* **************************************************************** */ /* **************************************************************** */

2
resis/ResMain.c
View File

@ -38,7 +38,7 @@ resNode *ResNodeQueue = NULL; /* Pending nodes */
resNode *ResOriginNode = NULL; /* node where R=0 */ resNode *ResOriginNode = NULL; /* node where R=0 */
resNode *resCurrentNode; resNode *resCurrentNode;
int ResTileCount = 0; /* Number of tiles rn_status */ int ResTileCount = 0; /* Number of tiles rn_status */
extern Region *ResFirst(); extern ExtRegion *ResFirst();
extern Tile *FindStartTile(); extern Tile *FindStartTile();
extern int ResEachTile(); extern int ResEachTile();
extern int ResLaplaceTile(); extern int ResLaplaceTile();

6
resis/ResUtils.c
View File

@ -44,7 +44,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
*/ */
Region * ExtRegion *
ResFirst(tile, arg) ResFirst(tile, arg)
Tile *tile; Tile *tile;
FindRegion *arg; FindRegion *arg;
@ -82,9 +82,9 @@ ResFirst(tile, arg)
reg->cp_contactTile = tile; reg->cp_contactTile = tile;
/* Prepend it to the region list */ /* Prepend it to the region list */
reg->cp_nextcontact = (ResContactPoint *) arg->fra_region; reg->cp_nextcontact = (ResContactPoint *) arg->fra_region;
arg->fra_region = (Region *) reg; arg->fra_region = (ExtRegion *) reg;
} }
return((Region *) NULL); return((ExtRegion *) NULL);
} }
/* /*

10
sim/SimExtract.c
View File

@ -580,7 +580,7 @@ SimFindOneNode( sx, tile )
arg.fra_pNum = DBPlane(type); arg.fra_pNum = DBPlane(type);
arg.fra_uninit = (ClientData) extUnInit; arg.fra_uninit = (ClientData) extUnInit;
arg.fra_region = (Region *) reg; arg.fra_region = (ExtRegion *) reg;
arg.fra_each = SimFindTxtor; arg.fra_each = SimFindTxtor;
(void) ExtFindNeighbors( tile, arg.fra_pNum, &arg ); (void) ExtFindNeighbors( tile, arg.fra_pNum, &arg );
@ -601,7 +601,7 @@ SimFindOneNode( sx, tile )
arg.fra_pNum = DBPlane(loctype); arg.fra_pNum = DBPlane(loctype);
arg.fra_uninit = (ClientData) extUnInit; arg.fra_uninit = (ClientData) extUnInit;
arg.fra_region = (Region *) reg; arg.fra_region = (ExtRegion *) reg;
arg.fra_each = SimTransistorTile; arg.fra_each = SimTransistorTile;
(void) ExtFindNeighbors( gateTile, arg.fra_pNum, &arg ); (void) ExtFindNeighbors( gateTile, arg.fra_pNum, &arg );
@ -609,7 +609,7 @@ SimFindOneNode( sx, tile )
arg.fra_connectsTo = ExtCurStyle->exts_nodeConn; arg.fra_connectsTo = ExtCurStyle->exts_nodeConn;
arg.fra_pNum = DBPlane(type); arg.fra_pNum = DBPlane(type);
arg.fra_uninit = (ClientData) reg; arg.fra_uninit = (ClientData) reg;
arg.fra_region = (Region *) extUnInit; arg.fra_region = (ExtRegion *) extUnInit;
arg.fra_each = (int (*)()) NULL; arg.fra_each = (int (*)()) NULL;
(void) ExtFindNeighbors( tile, arg.fra_pNum, &arg ); (void) ExtFindNeighbors( tile, arg.fra_pNum, &arg );
@ -640,12 +640,12 @@ SimFindOneNode( sx, tile )
arg.fra_pNum = DBPlane(loctype); arg.fra_pNum = DBPlane(loctype);
arg.fra_uninit = (ClientData) sdTile->ti_client; arg.fra_uninit = (ClientData) sdTile->ti_client;
arg.fra_region = (Region *) &ret; arg.fra_region = (ExtRegion *) &ret;
arg.fra_each = SimTransistorTile; arg.fra_each = SimTransistorTile;
(void) ExtFindNeighbors( sdTile, arg.fra_pNum, &arg ); (void) ExtFindNeighbors( sdTile, arg.fra_pNum, &arg );
/* Unmark the transitor, since its not part of this region */ /* Unmark the transitor, since its not part of this region */
arg.fra_region = (Region *) arg.fra_uninit; arg.fra_region = (ExtRegion *) arg.fra_uninit;
arg.fra_uninit = (ClientData) &ret; arg.fra_uninit = (ClientData) &ret;
arg.fra_each = (int (*)()) NULL; arg.fra_each = (int (*)()) NULL;
(void) ExtFindNeighbors( sdTile, arg.fra_pNum, &arg ); (void) ExtFindNeighbors( sdTile, arg.fra_pNum, &arg );

2
utils/netlist.h
View File

@ -48,7 +48,7 @@ typedef struct nlTermLoc
struct chan *nloc_chan; /* Contains nloc_stem */ struct chan *nloc_chan; /* Contains nloc_stem */
struct pin *nloc_pin; /* Pin on nloc_chan boundary */ struct pin *nloc_pin; /* Pin on nloc_chan boundary */
struct region *nloc_region; /* Region containing stem */ struct region *nloc_region; /* ExtRegion containing stem */
struct czone *nloc_czone; /* Range containing point */ struct czone *nloc_czone; /* Range containing point */
int nloc_stemcost; /* Cost of stem */ int nloc_stemcost; /* Cost of stem */
int nloc_flags; /* Flags */ int nloc_flags; /* Flags */