wiring: forward declaration prototypes and consistency

This commit is contained in:
Darryl L. Miles 2025-01-31 19:07:28 +00:00 committed by Tim Edwards
parent 154c3efa5c
commit 78f2c0696c
2 changed files with 6 additions and 4 deletions

View File

@ -81,12 +81,12 @@ wireFindRootWindow(
*/ */
{ {
MagWindow *mw; MagWindow *mw;
extern int wireFindRootFunc(); extern int wireFindRootFunc(MagWindow *window, ClientData cdata); /* forward declaration cb_windows_search_t (MagWindow **) */
mw = NULL; mw = NULL;
wireDesiredDef = rootDef; wireDesiredDef = rootDef;
(void) WindSearch(DBWclientID, (ClientData) NULL, (Rect *) NULL, (void) WindSearch(DBWclientID, (ClientData) NULL, (Rect *) NULL,
wireFindRootFunc, (ClientData) &mw); wireFindRootFunc, PTR2CD(&mw));
return mw; return mw;
} }
@ -99,8 +99,9 @@ wireFindRootWindow(
int int
wireFindRootFunc( wireFindRootFunc(
MagWindow *window, /* A layout window. */ MagWindow *window, /* A layout window. */
MagWindow **mwPtr) /* Copy layout window pointer to this */ ClientData cdata) /* Copy layout window pointer to this */
{ {
MagWindow **mwPtr = (MagWindow **)CD2PTR(cdata);
CellUse *use; CellUse *use;
use = (CellUse *) window->w_surfaceID; use = (CellUse *) window->w_surfaceID;

View File

@ -82,7 +82,8 @@ static int wireOldDir = GEO_NORTH; /* Last direction */
void void
WireUndoInit(void) WireUndoInit(void)
{ {
extern void WireUndoForw(), WireUndoBack(); extern void WireUndoForw(WireUndoEvent *wue); /* forward declaration */
extern void WireUndoBack(WireUndoEvent *wue); /* forward declaration */
WireUndoClientID = UndoAddClient((void (*)()) NULL, (void (*)()) NULL, WireUndoClientID = UndoAddClient((void (*)()) NULL, (void (*)()) NULL,
(UndoEvent *(*)()) NULL, (int (*)()) NULL, WireUndoForw, (UndoEvent *(*)()) NULL, (int (*)()) NULL, WireUndoForw,