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

Update to GCC 14+ (K&R Fix)

This commit is contained in:
Enno Schnackenberg 2026-05-05 13:07:04 +02:00
parent 91a1956fc0
commit a053b2fa14
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphics/graphics.h
View File

@ -50,13 +50,13 @@ extern int (*GrTextSizePtr)();
* You must call GrLock() before using these, and * You must call GrLock() before using these, and
* call GrUnlock() afterwards. * call GrUnlock() afterwards.
*/ */
extern void (*GrLockPtr)(); extern void (*GrLockPtr)(MagWindow *, bool);
extern void (*GrUnlockPtr)(); extern void (*GrUnlockPtr)(MagWindow *);
extern bool GrHaveLock(); extern bool GrHaveLock();
extern void GrClipTo(); extern void GrClipTo();
extern void GrClipBox(); extern void GrClipBox(Rect *, int);
extern void GrClipLine(); extern void GrClipLine();
extern bool GrPutText(); extern bool GrPutText(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)();
@ -84,7 +84,7 @@ extern bool GrDrawGlyphNum();
/* external color map routines */ /* external color map routines */
extern bool GrReadCMap(), GrSaveCMap(); extern bool GrReadCMap(), GrSaveCMap();
extern bool GrGetColor(), GrPutColor(); extern bool GrGetColor(int, int *, int *, int *), GrPutColor(int, int, int, int);
extern int GrNameToColor(); extern int GrNameToColor();
extern void GrPutManyColors(); extern void GrPutManyColors();
extern void (*GrSetCMapPtr)(); extern void (*GrSetCMapPtr)();

18
windows/windows.h
View File

@ -239,17 +239,19 @@ typedef struct WIND_S1 {
extern MagWindow *WindCreate(); extern MagWindow *WindCreate();
extern WindClient WindGetClient(); extern WindClient WindGetClient();
extern WindClient WindNextClient(); extern WindClient WindNextClient();
extern WindClient WindAddClient(); extern WindClient WindAddClient(char *, bool (*)(), bool (*)(), void (*)(),
void (*)(), void (*)(), bool (*)(),
void (*)(), void (*)());
extern char *WindGetClientName(); extern char *WindGetClientName();
extern void WindInit(); extern void WindInit();
extern void WindUpdate(); extern void WindUpdate();
extern void WindDrawBorder(); extern void WindDrawBorder();
extern void WindOutToIn(); extern void WindOutToIn();
extern void WindInToOut(); extern void WindInToOut();
extern void WindSetWindowAreas(); extern void WindSetWindowAreas(MagWindow *);
extern void windFixSurfaceArea(); extern void windFixSurfaceArea();
extern int WindExecute(); extern int WindExecute();
extern void WindAddCommand(); extern void WindAddCommand(WindClient, char *, void (*)(), bool);
extern int WindReplaceCommand(); extern int WindReplaceCommand();
extern const char * const *WindGetCommandTable(); extern const char * const *WindGetCommandTable();
extern int windCheckOnlyWindow(MagWindow **, WindClient); extern int windCheckOnlyWindow(MagWindow **, WindClient);
@ -263,7 +265,7 @@ extern MagWindow *WindSearchData();
/* procs for moving the surface inside of a window (changing the view) */ /* procs for moving the surface inside of a window (changing the view) */
extern void WindZoom(); extern void WindZoom();
extern void WindMove(); extern void WindMove(MagWindow *, Rect *);
extern void WindView(); extern void WindView();
extern void WindScroll(); extern void WindScroll();
@ -278,14 +280,14 @@ extern void WindFullScreen();
/* procs to transform into and out of screen coordinates */ /* procs to transform into and out of screen coordinates */
extern void WindScreenToSurface(); extern void WindScreenToSurface();
extern void WindSurfaceToScreen(); extern void WindSurfaceToScreen(MagWindow *, Rect *, Rect *);
extern void WindPointToSurface(); extern void WindPointToSurface();
extern void WindPointToScreen(); extern void WindPointToScreen();
extern void WindSurfaceToScreenNoClip(); extern void WindSurfaceToScreenNoClip(MagWindow *, Rect *, Rect *);
/* procs to change things or inform the window manager about changes */ /* procs to change things or inform the window manager about changes */
extern void WindCaption(); extern void WindCaption(MagWindow *, char *);
extern void WindAreaChanged(); extern void WindAreaChanged(MagWindow *, Rect *);
extern void WindIconChanged(); extern void WindIconChanged();
extern bool WindLoad(); extern bool WindLoad();
extern void WindSeparateRedisplay(); extern void WindSeparateRedisplay();