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

Corrected variables that set the PaintPlane routine, which had been 

changed from returning void to returning int without changing the
type of the variable, thus causing a compiler warning.
This commit is contained in:
Tim Edwards 2021-02-18 15:47:40 -05:00
parent 5b2042d078
commit 2d79e0e0ce
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/CmdTZ.c
View File

@ -1926,7 +1926,7 @@ CmdXor(w, cmd)
PaintResultType DBXORResultTbl[NP][NT][NT]; PaintResultType DBXORResultTbl[NP][NT][NT];
PaintResultType (*curPaintSave)[NT][NT]; PaintResultType (*curPaintSave)[NT][NT];
void (*curPlaneSave)(); int (*curPlaneSave)();
int p, t, h; int p, t, h;

2
drc/DRCarray.c
View File

@ -114,7 +114,7 @@ drcArrayFunc(scx, arg)
ClientData drcArrayClientData; /* Extra parameter to pass to func. */ ClientData drcArrayClientData; /* Extra parameter to pass to func. */
PaintResultType (*savedPaintTable)[NT][NT]; PaintResultType (*savedPaintTable)[NT][NT];
PaintResultType (*savedEraseTable)[NT][NT]; PaintResultType (*savedEraseTable)[NT][NT];
void (*savedPaintPlane)(); int (*savedPaintPlane)();
if ((use->cu_xlo == use->cu_xhi) && (use->cu_ylo == use->cu_yhi)) if ((use->cu_xlo == use->cu_xhi) && (use->cu_ylo == use->cu_yhi))
return 2; return 2;

4
drc/DRCsubcell.c
View File

@ -697,7 +697,7 @@ DRCInteractionCheck(def, area, erasebox, func, cdarg)
int oldTiles, count, x, y, errorSaveType; int oldTiles, count, x, y, errorSaveType;
Rect intArea, square, cliparea, subArea; Rect intArea, square, cliparea, subArea;
PaintResultType (*savedPaintTable)[NT][NT]; PaintResultType (*savedPaintTable)[NT][NT];
void (*savedPaintPlane)(); int (*savedPaintPlane)();
struct drcClientData arg; struct drcClientData arg;
SearchContext scx; SearchContext scx;
@ -897,7 +897,7 @@ DRCFlatCheck(use, area)
SearchContext scx; SearchContext scx;
void drcIncCount(); void drcIncCount();
PaintResultType (*savedPaintTable)[NT][NT]; PaintResultType (*savedPaintTable)[NT][NT];
void (*savedPaintPlane)(); int (*savedPaintPlane)();
int drcFlatCount = 0; int drcFlatCount = 0;
UndoDisable(); UndoDisable();

2
garouter/gaTest.c
View File

@ -61,7 +61,7 @@ int gaDebNoClean = 0;
/* Used in the "*garoute split" command */ /* Used in the "*garoute split" command */
PlaneMask gaSplitPlaneMask; PlaneMask gaSplitPlaneMask;
void (*gaSplitPaintPlane)(); int (*gaSplitPaintPlane)();
Rect gaSplitArea; Rect gaSplitArea;
int gaSplitType; int gaSplitType;

2
select/selCreate.c
View File

@ -1074,7 +1074,7 @@ SelectAndCopy2(newSourceDef)
SearchContext scx; SearchContext scx;
Rect editArea, labelArea, expanded; Rect editArea, labelArea, expanded;
int plane; int plane;
void (*savedPaintPlane)(); int (*savedPaintPlane)();
extern int selACPaintFunc(); /* Forward reference. */ extern int selACPaintFunc(); /* Forward reference. */
extern int selACCellFunc(); extern int selACCellFunc();