From baeec1b9579036aef128ebf2be9c535fe04490af Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Thu, 7 Nov 2024 12:39:55 -0800
Subject: [PATCH] Renames bitblt.h to bbtmacro.h and updates all uses

---
 CMakeLists.txt               |  2 +-
 bin/makefile-dos             |  2 +-
 bin/makefile-tail            | 16 ++++++++--------
 inc/{bitblt.h => bbtmacro.h} |  8 ++++----
 src/bbtsub.c                 |  2 +-
 src/bitblt.c                 |  2 +-
 src/draw.c                   |  2 +-
 src/keyevent.c               |  2 +-
 src/llcolor.c                |  2 +-
 src/rawcolor.c               |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)
 rename inc/{bitblt.h => bbtmacro.h} (96%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fabeb4b..851d4a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,7 +291,7 @@ SET(MAIKO_HDRS
     inc/bindefs.h
     inc/bindsdefs.h
     inc/bitbltdefs.h
-    inc/bitblt.h
+    inc/bbtmacro.h
     inc/bltdefs.h
     inc/byteswapdefs.h
     inc/car-cdrdefs.h
diff --git a/bin/makefile-dos b/bin/makefile-dos
index 176e8f3..9866836 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 osmsgprint.h pilotbbt.h print.h retmacro.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    bbtmacro.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 retmacro.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 b1ac3bb..d6277f7 100644
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -292,7 +292,7 @@ $(OBJECTDIR)bitblt.o: $(SRCDIR)bitblt.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)pilotbbt.h $(INCDIR)display.h \
-	$(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
+	$(INCDIR)bbtmacro.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)bitblt.c -o $(OBJECTDIR)bitblt.o
 
 $(OBJECTDIR)bbt68k.o: $(OBJECTDIR)bbt68k.i $(SRCDIR)bbt68k.s
@@ -311,7 +311,7 @@ $(OBJECTDIR)bbtsub.o: $(SRCDIR)bbtsub.c $(REQUIRED-INCS) \
 	$(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
 	$(INCDIR)bbtsubdefs.h $(INCDIR)car-cdrdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)kprintdefs.h \
-	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dspdata.h $(INCDIR)display.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)bbtsub.c -o $(OBJECTDIR)bbtsub.o
@@ -348,7 +348,7 @@ $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 $(OBJECTDIR)rawcolor.o: $(SRCDIR)rawcolor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)lspglob.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h \
-	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bitblt.h \
+	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)arith.h $(INCDIR)cell.h $(INCDIR)dspdata.h $(INCDIR)debug.h \
 	$(INCDIR)stream.h $(INCDIR)bbtsubdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)rawcolor.c -o $(OBJECTDIR)rawcolor.o
@@ -357,7 +357,7 @@ $(OBJECTDIR)llcolor.o: $(SRCDIR)llcolor.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)llcolordefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llcolor.c -o $(OBJECTDIR)llcolor.o
 
@@ -391,7 +391,7 @@ $(OBJECTDIR)mkcell.o: $(SRCDIR)mkcell.c $(REQUIRED-INCS) \
 $(OBJECTDIR)draw.o: $(SRCDIR)draw.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
-	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bitblt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)display.h $(INCDIR)drawdefs.h $(INCDIR)bbtsubdefs.h \
 	$(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)draw.c -o $(OBJECTDIR)draw.o
@@ -649,7 +649,7 @@ $(OBJECTDIR)initdsp.o: $(SRCDIR)initdsp.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)initdspdefs.h \
 	$(INCDIR)byteswapdefs.h $(INCDIR)xcursordefs.h $(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)initdsp.c -o $(OBJECTDIR)initdsp.o
@@ -682,7 +682,7 @@ $(OBJECTDIR)keyevent.o: $(SRCDIR)keyevent.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
 	$(INCDIR)address.h $(INCDIR)stack.h $(INCDIR)keyboard.h $(INCDIR)display.h \
-	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bitblt.h $(INCDIR)pilotbbt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h $(INCDIR)pilotbbt.h \
 	$(INCDIR)keyeventdefs.h $(INCDIR)osmsgdefs.h $(INCDIR)xwinmandefs.h \
 	$(INCDIR)devif.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)keyevent.c -o $(OBJECTDIR)keyevent.o
@@ -876,7 +876,7 @@ $(OBJECTDIR)uraid.o: $(SRCDIR)uraid.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)emlglob.h $(INCDIR)cell.h \
-	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bitblt.h \
+	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)uraiddefs.h $(INCDIR)dbgtooldefs.h $(INCDIR)stack.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)initkbddefs.h \
 	$(INCDIR)kprintdefs.h $(INCDIR)llstkdefs.h $(INCDIR)mkatomdefs.h \
diff --git a/inc/bitblt.h b/inc/bbtmacro.h
similarity index 96%
rename from inc/bitblt.h
rename to inc/bbtmacro.h
index fee6e27..eec47ae 100644
--- a/inc/bitblt.h
+++ b/inc/bbtmacro.h
@@ -1,10 +1,10 @@
-#ifndef BITBLT_H
-#define BITBLT_H 1
+#ifndef BBTMACRO_H
+#define BBTMACRO_H 1
 /* $Id: bitblt.h,v 1.2 1999/01/03 02:05:54 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 /*
  *	Copyright (C) 1988 by Fuji Xerox Co., Ltd. All rights reserved.
  *
- *	File :  bitblt.h
+ *	File :  bbtmacro.h (was bitblt.h)
  *
  *	Author :  Osamu Nakamura
  *
@@ -85,4 +85,4 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 #define UNLOCKSCREEN ScreenLocked = NIL
 
 #endif /* DOS */
-#endif /* BITBLT_H */
+#endif /* BBTMACRO_H */
diff --git a/src/bbtsub.c b/src/bbtsub.c
index 9e92e9e..f5b1fd3 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -60,7 +60,7 @@
 #include "returndefs.h"
 
 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dspdata.h"
 #include "display.h"
diff --git a/src/bitblt.c b/src/bitblt.c
index 087d393..96de42d 100644
--- a/src/bitblt.c
+++ b/src/bitblt.c
@@ -25,7 +25,7 @@
 
 #include "pilotbbt.h"
 #include "display.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "bb.h"
 
 #include "bitbltdefs.h"
diff --git a/src/draw.c b/src/draw.c
index 1b5fdac..0c88728 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -20,7 +20,7 @@
 #include <stddef.h>       // for ptrdiff_t
 #include <stdlib.h>       // for abs
 #include "adr68k.h"       // for NativeAligned2FromLAddr
-#include "bitblt.h"       // for MOUSEXR, MOUSEYH
+#include "bbtmacro.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"
diff --git a/src/keyevent.c b/src/keyevent.c
index ecc60b3..f2b380b 100644
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -51,7 +51,7 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "lsptypes.h"
 
 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 
 #include "keyeventdefs.h"
diff --git a/src/llcolor.c b/src/llcolor.c
index e994b94..e48b971 100644
--- a/src/llcolor.c
+++ b/src/llcolor.c
@@ -28,7 +28,7 @@
 #include "devconf.h"
 
 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dbprint.h"
 
diff --git a/src/rawcolor.c b/src/rawcolor.c
index 2850e7d..f2bc3c8 100644
--- a/src/rawcolor.c
+++ b/src/rawcolor.c
@@ -31,7 +31,7 @@
 #include "pilotbbt.h"
 #include "debug.h"
 #include "arith.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "lldsp.h"
 #include "bbtsubdefs.h"