github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-13 23:27:12 +00:00
Code Issues Projects Releases Wiki Activity

Remove bbtsub.h, duplicate of bbtsubdefs.h. (#294)

Browse Source 
`bbtsubdefs.h` and `bbtsub.h` were close to the same. We only
need one.
This commit is contained in:
Bruce Mitchener 2021-01-25 14:22:28 +07:00 committed by GitHub
parent 971794a14c
commit 07aed60cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -237,7 +237,6 @@ SET(MAIKO_HDRS
inc/array.h
inc/bb.h
inc/bbtsubdefs.h
inc/bbtsub.h
inc/bindefs.h
inc/bindsdefs.h
inc/bitbltdefs.h

10
bin/makefile-tail
View File

@ -289,7 +289,7 @@ $(OBJECTDIR)bbt68k.i : $(SRCDIR)bbt68k.s
$(OBJECTDIR)bbtSPARC.o : $(SRCDIR)bbtSPARC.s
as -P $(SRCDIR)bbtSPARC.s -o $(OBJECTDIR)bbtSPARC$(OEXT)
$(OBJECTDIR)bbtsub.o : $(SRCDIR)bbtsub.c $(INCDIR)bbtsub.h $(REQUIRED-INCS) $(INCDIR)lispemul.h \
$(OBJECTDIR)bbtsub.o : $(SRCDIR)bbtsub.c $(INCDIR)bbtsubdefs.h $(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)dspdata.h \
@ -325,7 +325,7 @@ $(OBJECTDIR)rawcolor.o : $(SRCDIR)rawcolor.c $(REQUIRED-INCS) $(INCDIR)lispemu
$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h \
$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bitblt.h \
$(INCDIR)arith.h $(INCDIR)cell.h $(INCDIR)dspdata.h $(INCDIR)debug.h \
$(INCDIR)stream.h $(INCDIR)bbtsub.h
$(INCDIR)stream.h $(INCDIR)bbtsubdefs.h
$(CC) $(RFLAGS) $(SRCDIR)rawcolor.c -o $(OBJECTDIR)rawcolor$(OEXT)
$(OBJECTDIR)llcolor.o : $(SRCDIR)llcolor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h $(INCDIR)lispmap.h \
@ -358,7 +358,7 @@ $(OBJECTDIR)mkcell.o : $(SRCDIR)mkcell.c $(REQUIRED-INCS) $(INCDIR)lispemul.h
$(OBJECTDIR)draw.o : $(SRCDIR)draw.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
$(INCDIR)lspglob.h $(INCDIR)adr68k.h \
$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h \
$(INCDIR)my.h $(INCDIR)bbtsub.h
$(INCDIR)my.h $(INCDIR)bbtsubdefs.h
$(CC) $(RFLAGS) $(SRCDIR)draw.c -o $(OBJECTDIR)draw$(OEXT)
$(OBJECTDIR)z2.o : $(SRCDIR)z2.c $(REQUIRED-INCS) \
@ -605,7 +605,7 @@ $(OBJECTDIR)lowlev2.o : $(SRCDIR)lowlev2.c $(REQUIRED-INCS) $(INCDIR)lispemul.
$(OBJECTDIR)misc7.o : $(SRCDIR)misc7.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
$(INCDIR)lspglob.h $(INCDIR)adr68k.h \
$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h \
$(INCDIR)stack.h $(INCDIR)opcodes.h $(INCDIR)display.h $(INCDIR)bbtsub.h
$(INCDIR)stack.h $(INCDIR)opcodes.h $(INCDIR)display.h $(INCDIR)bbtsubdefs.h
$(CC) $(RFLAGS) $(SRCDIR)misc7.c -o $(OBJECTDIR)misc7$(OEXT)
$(OBJECTDIR)mvs.o : $(SRCDIR)mvs.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
@ -658,7 +658,7 @@ $(OBJECTDIR)subr.o : $(SRCDIR)subr.c $(REQUIRED-INCS) \
$(INCDIR)adr68k.h $(INCDIR)subrs.h \
$(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)emlglob.h \
$(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h \
$(INCDIR)arith.h $(INCDIR)bbtsub.h
$(INCDIR)arith.h $(INCDIR)bbtsubdefs.h
$(CC) $(RFLAGS) $(SRCDIR)subr.c -o $(OBJECTDIR)subr$(OEXT)
$(OBJECTDIR)miscn.o : $(SRCDIR)miscn.c $(REQUIRED-INCS) \

34
inc/bbtsub.h
View File

@ -1,34 +0,0 @@
#ifndef BBTSUB_H
#define BBTSUB_H 1
/***** Don't use PixRect code on 386i for now *****/
/***** -or on any machine that doesn't support it (HP, e.g.) *****/
/********************************************************/
/* */
/* prropstyle is DEFINED when we want to use */
/* pixrect versions of the operations in this */
/* file, and UNDEFINED, when we want to use */
/* Don Charnley's bitblt code to do them. */
/* */
/********************************************************/
#if defined(SUNDISPLAY) && \
!defined(NOPIXRECT) && \
!defined(NEWBITBLT) && \
!defined(I386)
#define prropstyle 1
#endif
void bitbltsub(LispPTR *argv);
LispPTR n_new_cursorin(DLword *baseaddr, int dx, int dy, int w, int h);
LispPTR bitblt_bitmap(LispPTR *args);
LispPTR bitshade_bitmap(LispPTR *args);
#ifndef prropstyle
void bltchar(LispPTR *args);
void newbltchar(LispPTR *args);
#else
LispPTR bltchar(LispPTR *args);
LispPTR newbltchar(LispPTR *args);
#endif
void ccfuncall(unsigned int atom_index, int argnum, int bytenum);
void tedit_bltchar(LispPTR *args);
#endif /* BBTSUB_H */

22
inc/bbtsubdefs.h
View File

@ -1,5 +1,24 @@
#ifndef BBTSUBDEFS_H
#define BBTSUBDEFS_H 1
/***** Don't use PixRect code on 386i for now *****/
/***** -or on any machine that doesn't support it (HP, e.g.) *****/
/********************************************************/
/* */
/* prropstyle is DEFINED when we want to use */
/* pixrect versions of the operations in this */
/* file, and UNDEFINED, when we want to use */
/* Don Charnley's bitblt code to do them. */
/* */
/********************************************************/
#if defined(SUNDISPLAY) && \
!defined(NOPIXRECT) && \
!defined(NEWBITBLT) && \
!defined(I386)
#define prropstyle 1
#endif
void bitbltsub(LispPTR *argv);
LispPTR n_new_cursorin(DLword *baseaddr, int dx, int dy, int w, int h);
LispPTR bitblt_bitmap(LispPTR *args);
@ -11,6 +30,7 @@ void newbltchar(LispPTR *args);
LispPTR bltchar(LispPTR *args);
LispPTR newbltchar(LispPTR *args);
#endif
void ccfuncall(register unsigned int atom_index, register int argnum, register int bytenum);
void ccfuncall(unsigned int atom_index, int argnum, int bytenum);
void tedit_bltchar(LispPTR *args);
#endif

2
src/bbtsub.c
View File

@ -57,6 +57,7 @@
#include "gcdata.h"
#include "iopage.h"
#include "bbtsubdefs.h"
#include "car-cdrdefs.h"
#include "commondefs.h"
#include "gcarraydefs.h"
@ -70,7 +71,6 @@ extern IOPAGE *IOPage68K;
#include "bb.h"
#include "bitblt.h"
#include "pilotbbt.h"
#include "bbtsub.h"
#include "dspdata.h"
#include "display.h"
#include "dbprint.h"

2
src/draw.c
View File

@ -32,10 +32,10 @@
#include "emlglob.h"
#include "adr68k.h"
#include "bitblt.h"
#include "bbtsub.h"
#include "display.h"
#include "drawdefs.h"
#include "bbtsubdefs.h"
#include "initdspdefs.h"
#ifdef DISPLAYBUFFER

3
src/rawcolor.c
View File

@ -32,9 +32,10 @@
#include "debug.h"
#include "arith.h"
#include "bitblt.h"
#include "bbtsub.h"
#include "lldsp.h"
#include "bbtsubdefs.h"
#define IMIN(x, y) (((x) > (y)) ? (y) : (x))
#define IMAX(x, y) (((x) > (y)) ? (x) : (y))

1
src/subr.c
View File

@ -40,7 +40,6 @@
#include "arith.h"
#include "subrs.h"
#include "dbprint.h"
#include "bbtsub.h"
#include "subrdefs.h"
#include "bbtsubdefs.h"