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

Fix GCC 14 K&R prototype errors in windows.h and graphics.h (cmwind)

This commit is contained in:
Enno Schnackenberg 2026-05-05 13:41:13 +02:00
parent 198c211131
commit 70083211a0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/graphics.h
View File

@ -60,7 +60,7 @@ extern bool GrPutText(const char *, int, Point *, int, int, bool, Rect *, Rect *
extern void GrFillPolygon(); extern void GrFillPolygon();
extern void (*GrDrawGlyphPtr)(); extern void (*GrDrawGlyphPtr)();
extern void (*GrBitBltPtr)(); extern void (*GrBitBltPtr)();
extern int (*GrReadPixelPtr)(); extern int (*GrReadPixelPtr)(MagWindow *, int, int);
extern void (*GrFlushPtr)(); extern void (*GrFlushPtr)();
/* Tablet routines */ /* Tablet routines */
@ -83,7 +83,8 @@ extern bool GrDrawGlyphNum();
#define GrFastBox(x) GrDrawFastBox(x, 0) #define GrFastBox(x) GrDrawFastBox(x, 0)
/* external color map routines */ /* external color map routines */
extern bool GrReadCMap(), GrSaveCMap(); extern bool GrReadCMap(char *, char *, char *, char *, char *);
extern bool GrSaveCMap(char *, char *, char *, char *, char *);
extern bool GrGetColor(int, int *, int *, int *), GrPutColor(int, int, int, int); extern bool GrGetColor(int, int *, int *, int *), GrPutColor(int, int, int, int);
extern int GrNameToColor(); extern int GrNameToColor();
extern void GrPutManyColors(); extern void GrPutManyColors();

6
windows/windows.h
View File

@ -251,7 +251,7 @@ extern void WindOutToIn();
extern void WindInToOut(); extern void WindInToOut();
extern void WindSetWindowAreas(MagWindow *); extern void WindSetWindowAreas(MagWindow *);
extern void windFixSurfaceArea(); extern void windFixSurfaceArea();
extern int WindExecute(); extern int WindExecute(MagWindow *, WindClient, TxCommand *);
extern void WindAddCommand(WindClient, char *, void (*)(), bool); extern void WindAddCommand(WindClient, char *, void (*)(), bool);
extern int WindReplaceCommand(); extern int WindReplaceCommand();
extern const char * const *WindGetCommandTable(); extern const char * const *WindGetCommandTable();
@ -259,7 +259,7 @@ extern int windCheckOnlyWindow(MagWindow **, WindClient);
/* searching procs */ /* searching procs */
extern int WindSearch(); extern int WindSearch(WindClient, ClientData, Rect *, int (*)(), ClientData);
extern MagWindow *WindSearchWid(); extern MagWindow *WindSearchWid();
extern MagWindow *WindSearchData(); extern MagWindow *WindSearchData();
@ -282,7 +282,7 @@ extern void WindFullScreen();
extern void WindScreenToSurface(); extern void WindScreenToSurface();
extern void WindSurfaceToScreen(MagWindow *, const Rect *, Rect *); extern void WindSurfaceToScreen(MagWindow *, const Rect *, Rect *);
extern void WindPointToSurface(); extern void WindPointToSurface(MagWindow *, Point *, Point *, Rect *);
extern void WindPointToScreen(); extern void WindPointToScreen();
extern void WindSurfaceToScreenNoClip(MagWindow *, Rect *, Rect *); extern void WindSurfaceToScreenNoClip(MagWindow *, Rect *, Rect *);