From 99601ede751a2beb366d30ceb578d7409c932bee Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Tue, 5 Nov 2024 14:57:00 -0800 Subject: [PATCH] Removes incorrect dependency on osmsg.h and renames it to osmsgprint.h --- CMakeLists.txt | 2 +- bin/makefile-dos | 2 +- bin/makefile-tail | 10 +++++----- inc/{osmsg.h => osmsgprint.h} | 6 +++--- src/chardev.c | 1 - src/osmsg.c | 2 +- src/perrno.c | 2 +- src/uutils.c | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) rename inc/{osmsg.h => osmsgprint.h} (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22bcb2c..555525a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -394,7 +394,7 @@ SET(MAIKO_HDRS inc/opcodes.h inc/os.h inc/osmsgdefs.h - inc/osmsg.h + inc/osmsgprint.h inc/perrnodefs.h inc/picture.h inc/pilotbbt.h diff --git a/bin/makefile-dos b/bin/makefile-dos index f74f954..270b3e7 100644 --- a/bin/makefile-dos +++ b/bin/makefile-dos @@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk. OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj gcr.obj gcrcell.obj llstk.obj gcscan.obj loopsops.obj storage.obj allocmds.obj dir.obj gvar2.obj lowlev1.obj subr.obj arithops.obj lowlev2.obj subr0374.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj dsk.obj inet.obj misc7.obj timer.obj array2.obj dspif.obj initdsp.obj miscn.obj typeof.obj array3.obj initkbd.obj ubf1.obj array4.obj dspsubrs.obj initsout.obj mkatom.obj ubf2.obj array5.obj eqf.obj intcall.obj mkcell.obj ubf3.obj array6.obj ether.obj ufn.obj atom.obj findkey.obj kbdsubrs.obj mouseif.obj ufs.obj bbtsub.obj foreign.obj keyevent.obj unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj unwind.obj bitblt.obj gc.obj uraid.obj blt.obj gc2.obj kprint.obj osmsg.obj usrsubr.obj byteswap.obj gcarray.obj perrno.obj uutils.obj carcdr.obj asmbbt.obj gccode.obj vars3.obj gcfinal.obj ldsout.obj return.obj vmemsave.obj chardev.obj gchtfind.obj lineblt8.obj rpc.obj xc.obj common.obj gcmain3.obj lisp2c.obj rplcons.obj z2.obj vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES) -HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h +HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsgprint.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h diff --git a/bin/makefile-tail b/bin/makefile-tail index e0f5fc7..2d4ded9 100644 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -340,7 +340,7 @@ $(OBJECTDIR)car-cdr.o: $(SRCDIR)car-cdr.c $(REQUIRED-INCS) \ $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \ $(INCDIR)lispemul.h $(INCDIR)lispmap.h \ $(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)timeout.h \ - $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h \ + $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \ $(INCDIR)chardevdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \ $(INCDIR)perrnodefs.h $(CC) $(RFLAGS) $(SRCDIR)chardev.c -o $(OBJECTDIR)chardev.o @@ -450,7 +450,7 @@ $(OBJECTDIR)ubf3.o: $(SRCDIR)ubf3.c $(REQUIRED-INCS) \ $(OBJECTDIR)uutils.o: $(SRCDIR)uutils.c $(REQUIRED-INCS) \ $(INCDIR)lispemul.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \ - $(INCDIR)miscstat.h $(INCDIR)osmsg.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \ + $(INCDIR)miscstat.h $(INCDIR)osmsgprint.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \ $(INCDIR)osmsgdefs.h $(INCDIR)uraiddefs.h $(CC) $(RFLAGS) $(SRCDIR)uutils.c -o $(OBJECTDIR)uutils.o @@ -505,7 +505,7 @@ $(OBJECTDIR)dsk.o: $(SRCDIR)dsk.c $(REQUIRED-INCS) \ $(INCDIR)lispemul.h $(INCDIR)lispmap.h \ $(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \ $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)arith.h $(INCDIR)stream.h \ - $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \ + $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \ $(INCDIR)dbprint.h $(INCDIR)dskdefs.h $(INCDIR)byteswapdefs.h \ $(INCDIR)car-cdrdefs.h $(INCDIR)cell.h $(INCDIR)commondefs.h \ $(INCDIR)ufsdefs.h @@ -758,7 +758,7 @@ $(OBJECTDIR)osmsg.o: $(SRCDIR)osmsg.c $(REQUIRED-INCS) \ $(INCDIR)lispemul.h $(INCDIR)lispmap.h \ $(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)stream.h \ $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \ - $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \ + $(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsgprint.h \ $(INCDIR)dbprint.h $(INCDIR)commondefs.h $(INCDIR)osmsgdefs.h $(CC) $(RFLAGS) $(SRCDIR)osmsg.c -o $(OBJECTDIR)osmsg.o @@ -828,7 +828,7 @@ $(OBJECTDIR)subr0374.o: $(SRCDIR)subr0374.c $(REQUIRED-INCS) \ $(CC) $(RFLAGS) $(SRCDIR)subr0374.c -o $(OBJECTDIR)subr0374.o $(OBJECTDIR)perrno.o: $(SRCDIR)perrno.c $(REQUIRED-INCS) \ - $(INCDIR)lispemul.h $(INCDIR)osmsg.h \ + $(INCDIR)lispemul.h $(INCDIR)osmsgprint.h \ $(INCDIR)perrnodefs.h $(INCDIR)osmsgdefs.h $(CC) $(RFLAGS) $(SRCDIR)perrno.c -o $(OBJECTDIR)perrno.o diff --git a/inc/osmsg.h b/inc/osmsgprint.h similarity index 90% rename from inc/osmsg.h rename to inc/osmsgprint.h index 3868200..3503c42 100644 --- a/inc/osmsg.h +++ b/inc/osmsgprint.h @@ -1,5 +1,5 @@ -#ifndef OSMSG_H -#define OSMSG_H 1 +#ifndef OSMSGPRINT_H +#define OSMSGPRINT_H 1 /* $Id: osmsg.h,v 1.2 1999/01/03 02:06:20 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ @@ -23,4 +23,4 @@ print_exp; \ } while (0) -#endif /* OSMSG_H */ +#endif /* OSMSGPRINT_H */ diff --git a/src/chardev.c b/src/chardev.c index 8fcf0ff..7762521 100644 --- a/src/chardev.c +++ b/src/chardev.c @@ -43,7 +43,6 @@ #include "arith.h" #include "timeout.h" #include "locfile.h" -#include "osmsg.h" #include "dbprint.h" #include "chardevdefs.h" diff --git a/src/osmsg.c b/src/osmsg.c index 312a30d..6c0b748 100644 --- a/src/osmsg.c +++ b/src/osmsg.c @@ -44,7 +44,7 @@ #include "lspglob.h" #include "timeout.h" #include "locfile.h" -#include "osmsg.h" +#include "osmsgprint.h" #include "dbprint.h" #include "commondefs.h" diff --git a/src/perrno.c b/src/perrno.c index b2ed83f..a7c8b47 100644 --- a/src/perrno.c +++ b/src/perrno.c @@ -13,7 +13,7 @@ #include // for errno #include // for fprintf, perror, stderr, NULL #include // for strerror -#include "osmsg.h" // for OSMESSAGE_PRINT +#include "osmsgprint.h" // for OSMESSAGE_PRINT #include "perrnodefs.h" // for err_mess, perrorn /************************************************************************/ diff --git a/src/uutils.c b/src/uutils.c index e011229..e49e998 100644 --- a/src/uutils.c +++ b/src/uutils.c @@ -32,7 +32,7 @@ #include "lispemul.h" // for LispPTR, DLword, NIL, ATOM_T #include "lspglob.h" #include "lsptypes.h" // for GETWORD, OneDArray, GetTypeNumber, THIN_CHAR... -#include "osmsg.h" // for OSMESSAGE_PRINT +#include "osmsgprint.h" // for OSMESSAGE_PRINT #include "uraiddefs.h" // for device_after_raid, device_before_raid #include "uutilsdefs.h" // for c_string_to_lisp_string, check_unix_password