From c60b522012067bebb497b913cc70b78a4d293351 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sat, 13 Feb 2021 21:41:31 -0800 Subject: [PATCH] Files should explicitly include the definitions they directly depend on (#355) ... start by fixing the include files and the fallout in C source from removing includes not directly needed by headers that previously included them. --- inc/allocmdsdefs.h | 1 + inc/arith2defs.h | 1 + inc/arith3defs.h | 1 + inc/array.h | 6 +++--- inc/array2defs.h | 1 + inc/array3defs.h | 1 + inc/array4defs.h | 1 + inc/array5defs.h | 1 + inc/array6defs.h | 1 + inc/arraydefs.h | 1 + inc/bbtsubdefs.h | 2 ++ inc/bindefs.h | 1 + inc/bindsdefs.h | 1 + inc/bitblt.h | 5 +---- inc/bitbltdefs.h | 1 + inc/bltdefs.h | 1 + inc/car-cdrdefs.h | 3 ++- inc/cell.h | 2 ++ inc/chardevdefs.h | 1 + inc/conspagedefs.h | 2 +- inc/dbgtooldefs.h | 3 ++- inc/debug.h | 5 +---- inc/devif.h | 4 +--- inc/dirdefs.h | 1 + inc/display.h | 7 ++----- inc/dlpidefs.h | 1 + inc/drawdefs.h | 1 + inc/dskdefs.h | 1 + inc/dspdata.h | 9 ++------- inc/dspsubrsdefs.h | 1 + inc/eqfdefs.h | 1 + inc/ether.h | 6 +----- inc/etherdefs.h | 1 + inc/findkeydefs.h | 1 + inc/foreigndefs.h | 3 +-- inc/fpdefs.h | 1 + inc/fvardefs.h | 2 ++ inc/gcarraydefs.h | 1 + inc/gccodedefs.h | 1 + inc/gcdata.h | 5 +++-- inc/gcfinaldefs.h | 1 + inc/gchtfinddefs.h | 1 + inc/gcmain3defs.h | 1 + inc/gcoflowdefs.h | 1 + inc/gcrcelldefs.h | 1 + inc/gcscandefs.h | 1 + inc/gvar2defs.h | 1 + inc/hardrtndefs.h | 1 + inc/ifpage.h | 7 ++----- inc/inetdefs.h | 1 + inc/initdspdefs.h | 2 ++ inc/initsoutdefs.h | 1 + inc/iopage.h | 5 ++--- inc/kbdif.h | 6 +----- inc/kbdsubrsdefs.h | 1 + inc/keyboard.h | 5 +---- inc/keyeventdefs.h | 1 + inc/kprintdefs.h | 1 + inc/ldeXdefs.h | 4 ---- inc/lineblt8defs.h | 2 ++ inc/lisp2cdefs.h | 1 + inc/lispemul.h | 14 +++----------- inc/llcolordefs.h | 1 + inc/lldsp.h | 6 +++--- inc/llstkdefs.h | 3 ++- inc/locfile.h | 5 +---- inc/loopsopsdefs.h | 1 + inc/lowlev1defs.h | 1 + inc/lowlev2defs.h | 1 + inc/lspglob.h | 7 +++++-- inc/lsptypes.h | 4 ++-- inc/lsthandldefs.h | 1 + inc/misc7defs.h | 1 + inc/mkatomdefs.h | 1 + inc/mkcelldefs.h | 1 + inc/mnxdefs.h | 12 +++++------- inc/mvsdefs.h | 3 ++- inc/my.h | 7 ++++--- inc/osmsgdefs.h | 1 + inc/picture.h | 3 +-- inc/pilotbbt.h | 6 +----- inc/rawrs232c.h | 3 +-- inc/returndefs.h | 1 + inc/rpcdefs.h | 1 + inc/rplconsdefs.h | 1 + inc/rs232c.h | 8 +------- inc/shiftdefs.h | 1 + inc/stack.h | 2 ++ inc/storagedefs.h | 1 + inc/stream.h | 5 ++--- inc/subr0374defs.h | 1 + inc/subrdefs.h | 1 + inc/sxhashdefs.h | 1 + inc/testtooldefs.h | 5 +++-- inc/timeout.h | 7 +------ inc/timerdefs.h | 1 + inc/tty.h | 3 +-- inc/typeofdefs.h | 1 + inc/ubf1defs.h | 1 + inc/ubf2defs.h | 1 + inc/ubf3defs.h | 1 + inc/ufsdefs.h | 1 + inc/unixcommdefs.h | 1 + inc/unwinddefs.h | 1 + inc/uraiddefs.h | 1 + inc/uutilsdefs.h | 2 ++ inc/vars3defs.h | 2 ++ inc/vmemsavedefs.h | 1 + inc/xbbtdefs.h | 2 ++ inc/xcursordefs.h | 7 ++++--- inc/xinitdefs.h | 1 + inc/xmkicondefs.h | 2 ++ inc/xscroll.h | 2 +- inc/xscrolldefs.h | 1 + inc/xwinmandefs.h | 5 +++-- inc/z2defs.h | 1 + src/bbtsub.c | 1 + src/common.c | 1 + src/conspage.c | 1 + src/draw.c | 1 + src/dspif.c | 1 + src/lisp2c.c | 1 + src/rs232c.c | 10 ++++++++-- src/setsout.c | 1 + src/testtool.c | 1 + src/tstsout.c | 1 + src/vmemsave.c | 2 +- src/xwinman.c | 1 + 128 files changed, 180 insertions(+), 131 deletions(-) diff --git a/inc/allocmdsdefs.h b/inc/allocmdsdefs.h index 3919b3b..20e7955 100644 --- a/inc/allocmdsdefs.h +++ b/inc/allocmdsdefs.h @@ -1,5 +1,6 @@ #ifndef ALLOCMDSDEFS_H #define ALLOCMDSDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ LispPTR initmdspage(register LispPTR *base, register DLword size, register LispPTR prev); LispPTR *alloc_mdspage(register short int type); #endif diff --git a/inc/arith2defs.h b/inc/arith2defs.h index 6b39273..2d8f520 100644 --- a/inc/arith2defs.h +++ b/inc/arith2defs.h @@ -1,5 +1,6 @@ #ifndef ARITH2DEFS_H #define ARITH2DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_plus2(int tosm1, int tos); LispPTR N_OP_iplus2(int tosm1, int tos); LispPTR N_OP_difference(int tosm1, int tos); diff --git a/inc/arith3defs.h b/inc/arith3defs.h index 97a3399..1b18131 100644 --- a/inc/arith3defs.h +++ b/inc/arith3defs.h @@ -1,5 +1,6 @@ #ifndef ARITH3DEFS_H #define ARITH3DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_makenumber(int tosm1, int tos); LispPTR N_OP_boxiplus(register int a, int tos); LispPTR N_OP_boxidiff(register int a, int tos); diff --git a/inc/array.h b/inc/array.h index 58bf797..e08a9b3 100644 --- a/inc/array.h +++ b/inc/array.h @@ -2,9 +2,6 @@ #define ARRAY_H 1 /* $Id: array.h,v 1.2 1999/01/03 02:05:53 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ @@ -12,6 +9,9 @@ /* */ /************************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ +#include "version.h" /* for BIGVM */ + #ifndef BYTESWAP /********************************/ /* Normal byte-order version */ diff --git a/inc/array2defs.h b/inc/array2defs.h index 6ce9c0e..0dd3347 100644 --- a/inc/array2defs.h +++ b/inc/array2defs.h @@ -1,5 +1,6 @@ #ifndef ARRAY2DEFS_H #define ARRAY2DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_misc4(register LispPTR data, register LispPTR base, register LispPTR typenumber, register LispPTR inx, int alpha); #endif diff --git a/inc/array3defs.h b/inc/array3defs.h index 692287b..bd02479 100644 --- a/inc/array3defs.h +++ b/inc/array3defs.h @@ -1,4 +1,5 @@ #ifndef ARRAY3DEFS_H #define ARRAY3DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_aref1(register LispPTR arrayarg, register LispPTR inx); #endif diff --git a/inc/array4defs.h b/inc/array4defs.h index a65eec3..0e74d74 100644 --- a/inc/array4defs.h +++ b/inc/array4defs.h @@ -1,4 +1,5 @@ #ifndef ARRAY4DEFS_H #define ARRAY4DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_aset1(register LispPTR data, LispPTR arrayarg, register int inx); #endif diff --git a/inc/array5defs.h b/inc/array5defs.h index ef74bde..9906ecf 100644 --- a/inc/array5defs.h +++ b/inc/array5defs.h @@ -1,4 +1,5 @@ #ifndef ARRAY5DEFS_H #define ARRAY5DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_aref2(LispPTR arrayarg, LispPTR inx0, LispPTR inx1); #endif diff --git a/inc/array6defs.h b/inc/array6defs.h index 299a325..367595b 100644 --- a/inc/array6defs.h +++ b/inc/array6defs.h @@ -1,4 +1,5 @@ #ifndef ARRAY6DEFS_H #define ARRAY6DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_aset2(register LispPTR data, LispPTR arrayarg, LispPTR inx0, LispPTR inx1); #endif diff --git a/inc/arraydefs.h b/inc/arraydefs.h index ebe07a5..c75b52b 100644 --- a/inc/arraydefs.h +++ b/inc/arraydefs.h @@ -1,4 +1,5 @@ #ifndef ARRAYDEFS_H #define ARRAYDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_misc3(LispPTR baseL, LispPTR typenumber, LispPTR inx, int alpha); #endif diff --git a/inc/bbtsubdefs.h b/inc/bbtsubdefs.h index 65f9319..726094b 100644 --- a/inc/bbtsubdefs.h +++ b/inc/bbtsubdefs.h @@ -12,6 +12,8 @@ /* Don Charnley's bitblt code to do them. */ /* */ /********************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ + #if defined(SUNDISPLAY) && \ !defined(NOPIXRECT) && \ !defined(NEWBITBLT) diff --git a/inc/bindefs.h b/inc/bindefs.h index 2ee2059..5a153a0 100644 --- a/inc/bindefs.h +++ b/inc/bindefs.h @@ -1,4 +1,5 @@ #ifndef BINDEFS_H #define BINDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_bin(register int tos); #endif diff --git a/inc/bindsdefs.h b/inc/bindsdefs.h index 1eb97c2..d4d1db4 100644 --- a/inc/bindsdefs.h +++ b/inc/bindsdefs.h @@ -1,5 +1,6 @@ #ifndef BINDSDEFS_H #define BINDSDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR *N_OP_bind(register LispPTR *stack_pointer, register LispPTR tos, int byte1, int byte2); LispPTR *N_OP_unbind(register LispPTR *stack_pointer); LispPTR *N_OP_dunbind(register LispPTR *stack_pointer, register LispPTR tos); diff --git a/inc/bitblt.h b/inc/bitblt.h index 18ddbd1..565a71b 100644 --- a/inc/bitblt.h +++ b/inc/bitblt.h @@ -10,8 +10,6 @@ * */ - - /************************************************************************/ /* */ /* Copyright 1989, 1990 Venue, Fuji Xerox Co., Ltd, Xerox Corp. */ @@ -20,8 +18,7 @@ /* Agreement dated 18-August-1989 for support of Medley. */ /* */ /************************************************************************/ - - +#include "lispemul.h" /* for DLword */ #define REPLACE 0 #define PAINT 2 diff --git a/inc/bitbltdefs.h b/inc/bitbltdefs.h index b7a63c0..7c34c26 100644 --- a/inc/bitbltdefs.h +++ b/inc/bitbltdefs.h @@ -1,5 +1,6 @@ #ifndef BITBLTDEFS_H #define BITBLTDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos); int cursorin(DLword addrhi, DLword addrlo, int w, int h, int backward); #endif diff --git a/inc/bltdefs.h b/inc/bltdefs.h index a5fbdd4..a8901e4 100644 --- a/inc/bltdefs.h +++ b/inc/bltdefs.h @@ -1,5 +1,6 @@ #ifndef BLTDEFS_H #define BLTDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_blt(LispPTR destptr, LispPTR sourceptr, register LispPTR wordcount); #endif diff --git a/inc/car-cdrdefs.h b/inc/car-cdrdefs.h index 679f8e6..2e6eb57 100644 --- a/inc/car-cdrdefs.h +++ b/inc/car-cdrdefs.h @@ -1,6 +1,7 @@ #ifndef CAR_CDRDEFS_H #define CAR_CDRDEFS_H 1 -#include "cell.h" +#include "cell.h" /* for ConsCell */ +#include "lispemul.h" /* for LispPTR */ LispPTR car(register LispPTR datum); LispPTR cdr(register LispPTR datum); LispPTR rplaca(register LispPTR x, register LispPTR y); diff --git a/inc/cell.h b/inc/cell.h index 07a16cc..5a805a5 100755 --- a/inc/cell.h +++ b/inc/cell.h @@ -20,6 +20,8 @@ */ /**********************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ +#include "version.h" /* for BIGVM, NEWCDRCODING, BIGATOMS */ /* CONS CELL (LISTP) definitions moved to lispemulater.h */ diff --git a/inc/chardevdefs.h b/inc/chardevdefs.h index 5a93fa1..9d926ee 100644 --- a/inc/chardevdefs.h +++ b/inc/chardevdefs.h @@ -1,5 +1,6 @@ #ifndef CHARDEVDEFS_H #define CHARDEVDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR CHAR_openfile(LispPTR *args); LispPTR CHAR_closefile(LispPTR *args); LispPTR CHAR_ioctl(LispPTR *args); diff --git a/inc/conspagedefs.h b/inc/conspagedefs.h index c7b58e7..568c2a0 100644 --- a/inc/conspagedefs.h +++ b/inc/conspagedefs.h @@ -1,6 +1,6 @@ #ifndef CONSPAGEDEFS_H #define CONSPAGEDEFS_H 1 -#include "cell.h" +#include "lispemul.h" /* for LispPTR */ struct conspage *next_conspage(void); LispPTR N_OP_cons(register int cons_car, register int cons_cdr); LispPTR cons(LispPTR cons_car, LispPTR cons_cdr); diff --git a/inc/dbgtooldefs.h b/inc/dbgtooldefs.h index c8a39e6..d7bc885 100644 --- a/inc/dbgtooldefs.h +++ b/inc/dbgtooldefs.h @@ -1,6 +1,7 @@ #ifndef DBGTOOLDEFS_H #define DBGTOOLDEFS_H 1 -#include "stack.h" +#include "lispemul.h" /* for LispPTR, DLword */ +#include "stack.h" /* frameex1, fnhead, FX */ LispPTR get_ivar_name(struct frameex1 *fx_addr68k, DLword offset, int *localivar); LispPTR get_pvar_name(struct frameex1 *fx_addr68k, DLword offset); LispPTR get_fn_fvar_name(struct fnhead *fnobj, DLword offset); diff --git a/inc/debug.h b/inc/debug.h index 02532c3..1c441b3 100644 --- a/inc/debug.h +++ b/inc/debug.h @@ -2,16 +2,13 @@ #define DEBUG_H 1 /* $Id: debug.h,v 1.2 1999/01/03 02:05:56 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - +#include "lispemul.h" /* for LispPTR, DLword */ #ifndef BYTESWAP /************************************************/ diff --git a/inc/devif.h b/inc/devif.h index a10c37f..104c0f9 100644 --- a/inc/devif.h +++ b/inc/devif.h @@ -2,8 +2,6 @@ #define DEVIF_H 1 /* $Id: devif.h,v 1.2 1999/01/03 02:05:57 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989, 1990, 1990, 1991, 1992, 1993, 1994, 1995 Venue. */ @@ -11,6 +9,7 @@ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ typedef void (*PFV)(); /* Pointer to Function returning Void */ typedef int (*PFI)(); /* Pointer to Function returning Int */ @@ -23,7 +22,6 @@ typedef unsigned long (*PFUL)(); /* Pointer to Function returning an unsigned lo #include #endif /* XWINDOW */ - typedef struct { short type; /* Type of event */ diff --git a/inc/dirdefs.h b/inc/dirdefs.h index a520211..763e2c5 100644 --- a/inc/dirdefs.h +++ b/inc/dirdefs.h @@ -1,5 +1,6 @@ #ifndef DIRDEFS_H #define DIRDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ #ifdef DOS int make_old_version(char *old, char *file); #endif diff --git a/inc/display.h b/inc/display.h index 03453ea..0155cce 100755 --- a/inc/display.h +++ b/inc/display.h @@ -3,20 +3,17 @@ /* $Id: display.h,v 1.2 1999/01/03 02:05:57 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - - /************************************************************************/ /* */ /* (C) Copyright 1989-94 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for DLword */ +#include "version.h" /* for UNSIGNED */ #define BCPLDISPLAY stdout - #define CURSORWIDTH 16 #define CURSORHEIGHT 16 diff --git a/inc/dlpidefs.h b/inc/dlpidefs.h index 29f45dd..0825dc4 100644 --- a/inc/dlpidefs.h +++ b/inc/dlpidefs.h @@ -1,5 +1,6 @@ #ifndef DLPIDEFS_H #define DLPIDEFS_H 1 +#include /* for u_char, u_long */ int setup_dlpi_dev(char *device); void flush_dlpi(int fd); int dlpi_devtype(int fd); diff --git a/inc/drawdefs.h b/inc/drawdefs.h index c30a344..160dc45 100644 --- a/inc/drawdefs.h +++ b/inc/drawdefs.h @@ -1,4 +1,5 @@ #ifndef DRAWDEFS_H #define DRAWDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int op, int delta, int numx, int numy); #endif diff --git a/inc/dskdefs.h b/inc/dskdefs.h index c3c84eb..a868dcf 100644 --- a/inc/dskdefs.h +++ b/inc/dskdefs.h @@ -1,5 +1,6 @@ #ifndef DSKDEFS_H #define DSKDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ #ifdef DOS void separate_host(char *lfname, char *host, char *drive); #else diff --git a/inc/dspdata.h b/inc/dspdata.h index 4a0bf5d..d5ec3ca 100644 --- a/inc/dspdata.h +++ b/inc/dspdata.h @@ -2,19 +2,14 @@ #define DSPDATA_H 1 /* $Id: dspdata.h,v 1.2 1999/01/03 02:05:58 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - +#include "lispemul.h" /* for LispPTR, DLword */ +#include "version.h" /* for BIGVM */ #ifndef BYTESWAP /******************************************************/ diff --git a/inc/dspsubrsdefs.h b/inc/dspsubrsdefs.h index 34add2b..eb38979 100644 --- a/inc/dspsubrsdefs.h +++ b/inc/dspsubrsdefs.h @@ -1,5 +1,6 @@ #ifndef DSPSUBRSDEFS_H #define DSPSUBRSDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ void DSP_dspbout(LispPTR *args); void DSP_showdisplay(LispPTR *args); LispPTR DSP_VideoColor(LispPTR *args); diff --git a/inc/eqfdefs.h b/inc/eqfdefs.h index 0969b96..1847aea 100644 --- a/inc/eqfdefs.h +++ b/inc/eqfdefs.h @@ -1,5 +1,6 @@ #ifndef EQFDEFS_H #define EQFDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_clequal(register int arg1, register int arg2); LispPTR N_OP_eqlop(register int arg1, register int arg2); LispPTR N_OP_equal(register int arg1, register int arg2); diff --git a/inc/ether.h b/inc/ether.h index 224bbb2..4e651df 100644 --- a/inc/ether.h +++ b/inc/ether.h @@ -2,17 +2,13 @@ #define ETHER_H 1 /* $Id: ether.h,v 1.2 1999/01/03 02:05:59 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - +#include "lispemul.h" /* for LispPTR, DLword */ #ifndef BYTESWAP diff --git a/inc/etherdefs.h b/inc/etherdefs.h index 056aa7f..90dbd6f 100644 --- a/inc/etherdefs.h +++ b/inc/etherdefs.h @@ -1,5 +1,6 @@ #ifndef ETHERDEFS_H #define ETHERDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR ether_suspend(LispPTR args[]); LispPTR ether_resume(LispPTR args[]); LispPTR ether_ctrlr(LispPTR args[]); diff --git a/inc/findkeydefs.h b/inc/findkeydefs.h index d305335..8d17b6f 100644 --- a/inc/findkeydefs.h +++ b/inc/findkeydefs.h @@ -1,4 +1,5 @@ #ifndef FINDKEYDEFS_H #define FINDKEYDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_findkey(register LispPTR tos, register int byte); #endif diff --git a/inc/foreigndefs.h b/inc/foreigndefs.h index 3b28fe6..d60e6a3 100644 --- a/inc/foreigndefs.h +++ b/inc/foreigndefs.h @@ -1,6 +1,6 @@ #ifndef FOREIGNDEFS_H #define FOREIGNDEFS_H 1 - +#include "lispemul.h" /* for LispPTR */ LispPTR call_c_fn(LispPTR *args); LispPTR smashing_c_fn(LispPTR *args); int Mdld_link(LispPTR *args); @@ -14,5 +14,4 @@ int c_malloc(LispPTR *args); int c_free(LispPTR *args); int put_c_basebyte(LispPTR *args); int get_c_basebyte(LispPTR *args); - #endif /* FOREIGNDEFS_H */ diff --git a/inc/fpdefs.h b/inc/fpdefs.h index bbd172f..21a2910 100644 --- a/inc/fpdefs.h +++ b/inc/fpdefs.h @@ -1,5 +1,6 @@ #ifndef FPDEFS_H #define FPDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_fplus2(LispPTR parg1, LispPTR parg2); LispPTR N_OP_fdifference(LispPTR parg1, LispPTR parg2); LispPTR N_OP_ftimes2(LispPTR parg1, LispPTR parg2); diff --git a/inc/fvardefs.h b/inc/fvardefs.h index c949747..a6ace0e 100644 --- a/inc/fvardefs.h +++ b/inc/fvardefs.h @@ -1,5 +1,7 @@ #ifndef FVARDEFS_H #define FVARDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ +#include "stack.h" /* for fnhead, frameex1 */ LispPTR N_OP_fvarn(register int n); LispPTR N_OP_stkscan(LispPTR tos); LispPTR N_OP_fvar_(register LispPTR tos, register int n); diff --git a/inc/gcarraydefs.h b/inc/gcarraydefs.h index c3aa98e..4f14f32 100644 --- a/inc/gcarraydefs.h +++ b/inc/gcarraydefs.h @@ -1,5 +1,6 @@ #ifndef GCARRAYDEFS_H #define GCARRAYDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ LispPTR aref1(LispPTR array, int index); LispPTR find_symbol(const char *char_base, DLword offset, DLword length, LispPTR hashtbl, DLword fatp, DLword lispp); LispPTR get_package_atom(const char *char_base, DLword charlen, const char *packname, DLword packlen, int externalp); diff --git a/inc/gccodedefs.h b/inc/gccodedefs.h index c26d6d7..33fdd68 100644 --- a/inc/gccodedefs.h +++ b/inc/gccodedefs.h @@ -1,5 +1,6 @@ #ifndef GCCODEDEFS_H #define GCCODEDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR map_code_pointers(LispPTR codeblock, short int casep); LispPTR remimplicitkeyhash(LispPTR item, LispPTR ik_hash_table); LispPTR reclaimcodeblock(LispPTR codebase); diff --git a/inc/gcdata.h b/inc/gcdata.h index 9f6c7a1..807a007 100644 --- a/inc/gcdata.h +++ b/inc/gcdata.h @@ -2,8 +2,6 @@ #define GCDATA_H 1 /* $Id: gc.h,v 1.3 2001/12/24 01:08:57 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-94 Venue. All Rights Reserved. */ @@ -19,6 +17,9 @@ */ /**********************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ +#include "version.h" /* for USHORT */ + #define ADDREF 0 /* for gclookup routine. */ #define DELREF 1 /* for gclookup routine. */ #define STKREF 2 /* for gclookup routine. */ diff --git a/inc/gcfinaldefs.h b/inc/gcfinaldefs.h index 20dea3b..88945e3 100644 --- a/inc/gcfinaldefs.h +++ b/inc/gcfinaldefs.h @@ -1,5 +1,6 @@ #ifndef GCFINALDEFS_H #define GCFINALDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ void printarrayblock(LispPTR base); int integerlength(unsigned int n); LispPTR findptrsbuffer(LispPTR ptr); diff --git a/inc/gchtfinddefs.h b/inc/gchtfinddefs.h index e648a2d..20a5243 100644 --- a/inc/gchtfinddefs.h +++ b/inc/gchtfinddefs.h @@ -1,5 +1,6 @@ #ifndef GCHTFINDDEFS_H #define GCHTFINDDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ void enter_big_reference_count(LispPTR ptr); void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr); LispPTR htfind(LispPTR ptr, int casep); diff --git a/inc/gcmain3defs.h b/inc/gcmain3defs.h index 9e97019..6111432 100644 --- a/inc/gcmain3defs.h +++ b/inc/gcmain3defs.h @@ -1,5 +1,6 @@ #ifndef GCMAIN3DEFS_H #define GCMAIN3DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR gcmapscan(void); LispPTR gcmapscan(void); LispPTR gcmapunscan(void); diff --git a/inc/gcoflowdefs.h b/inc/gcoflowdefs.h index 0026ead..10bbf98 100644 --- a/inc/gcoflowdefs.h +++ b/inc/gcoflowdefs.h @@ -1,5 +1,6 @@ #ifndef GCOFLOWDEFS_H #define GCOFLOWDEFS_H 1 +#include "lispemul.h" /* for DLword */ DLword gc_handleoverflow(DLword arg); DLword gcmaptable(DLword arg); #endif diff --git a/inc/gcrcelldefs.h b/inc/gcrcelldefs.h index ee3a174..f2e2448 100644 --- a/inc/gcrcelldefs.h +++ b/inc/gcrcelldefs.h @@ -1,5 +1,6 @@ #ifndef GCRCELLDEFS_H #define GCRCELLDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ void freelistcell(LispPTR cell); LispPTR gcreccell(LispPTR cell); void freelistcell(LispPTR cell); diff --git a/inc/gcscandefs.h b/inc/gcscandefs.h index d354c29..7799b97 100644 --- a/inc/gcscandefs.h +++ b/inc/gcscandefs.h @@ -1,5 +1,6 @@ #ifndef GCSCANDEFS_H #define GCSCANDEFS_H 1 +#include "lispemul.h" /* for DLword */ DLword gcscan1(register int probe); DLword gcscan2(register int probe); #endif diff --git a/inc/gvar2defs.h b/inc/gvar2defs.h index 5fcada8..84fa6d3 100644 --- a/inc/gvar2defs.h +++ b/inc/gvar2defs.h @@ -1,5 +1,6 @@ #ifndef GVAR2DEFS_H #define GVAR2DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_gvar_(register LispPTR tos, unsigned int atom_index); LispPTR N_OP_rplptr(register LispPTR tos_m_1, register LispPTR tos, unsigned int alpha); #endif diff --git a/inc/hardrtndefs.h b/inc/hardrtndefs.h index 2fa3202..8671e29 100644 --- a/inc/hardrtndefs.h +++ b/inc/hardrtndefs.h @@ -1,5 +1,6 @@ #ifndef HARDRTNDEFS_H #define HARDRTNDEFS_H 1 +#include "stack.h" /* for FX */ int slowreturn(void); void incusecount68k(FX *fx68k); #endif diff --git a/inc/ifpage.h b/inc/ifpage.h index e40b748..6aaa5f8 100755 --- a/inc/ifpage.h +++ b/inc/ifpage.h @@ -2,17 +2,14 @@ #define IFPAGE_H 1 /* $Id: ifpage.h,v 1.2 1999/01/03 02:06:01 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ +#include "version.h" /* for BIGVM */ #define IFPAGE_KEYVAL 0x15e3 #ifndef BYTESWAP diff --git a/inc/inetdefs.h b/inc/inetdefs.h index c0fcecd..72054c9 100644 --- a/inc/inetdefs.h +++ b/inc/inetdefs.h @@ -1,4 +1,5 @@ #ifndef INETDEFS_H #define INETDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, LispPTR bufaddr, LispPTR maxlen); #endif diff --git a/inc/initdspdefs.h b/inc/initdspdefs.h index 2d21760..0e86f02 100644 --- a/inc/initdspdefs.h +++ b/inc/initdspdefs.h @@ -1,5 +1,7 @@ #ifndef INITDSPDEFS_H #define INITDSPDEFS_H 1 +#include "lispemul.h" /* for DLword */ +#include "version.h" /* for UNSIGNED */ void init_cursor(void); void set_cursor(void); void clear_display(void); diff --git a/inc/initsoutdefs.h b/inc/initsoutdefs.h index 8dc45ee..647204a 100644 --- a/inc/initsoutdefs.h +++ b/inc/initsoutdefs.h @@ -1,5 +1,6 @@ #ifndef INITSOUTDEFS_H #define INITSOUTDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR *fixp_value(LispPTR *ptr); void init_ifpage(int sysout_size); void init_iopage(void); diff --git a/inc/iopage.h b/inc/iopage.h index 655747d..28c45cf 100755 --- a/inc/iopage.h +++ b/inc/iopage.h @@ -2,15 +2,14 @@ #define IOPAGE_H 1 /* $Id: iopage.h,v 1.2 1999/01/03 02:06:06 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for DLword */ + #ifndef BYTESWAP /* Normal definition, for big-endian machines */ typedef struct iopage { diff --git a/inc/kbdif.h b/inc/kbdif.h index a02482e..6df02da 100644 --- a/inc/kbdif.h +++ b/inc/kbdif.h @@ -2,10 +2,6 @@ #define KBDIF_H 1 /* $Id: kbdif.h,v 1.2 1999/01/03 02:06:06 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - - /************************************************************************/ /* */ /* (C) Copyright 1990, 1990, 1991, 1992, 1993, 1994, 1995 Venue. */ @@ -13,7 +9,7 @@ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - +#include /* for u_char */ /* The Keyboard structure. */ diff --git a/inc/kbdsubrsdefs.h b/inc/kbdsubrsdefs.h index 6f28624..6828413 100644 --- a/inc/kbdsubrsdefs.h +++ b/inc/kbdsubrsdefs.h @@ -1,5 +1,6 @@ #ifndef KBDSUBRSDEFS_H #define KBDSUBRSDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ void KB_enable(LispPTR *args); void KB_beep(LispPTR *args); void KB_setmp(LispPTR *args); diff --git a/inc/keyboard.h b/inc/keyboard.h index 0593cb3..9ad4e25 100644 --- a/inc/keyboard.h +++ b/inc/keyboard.h @@ -2,18 +2,15 @@ #define KEYBOARD_H 1 /* $Id: keyboard.h,v 1.2 1999/01/03 02:06:06 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - /** Header File for K/B MOUSE */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - +#include "lispemul.h" /* for DLword */ #define MOUSE_LEFT 13 #define MOUSE_MIDDLE 15 diff --git a/inc/keyeventdefs.h b/inc/keyeventdefs.h index d296321..69e69c3 100644 --- a/inc/keyeventdefs.h +++ b/inc/keyeventdefs.h @@ -1,5 +1,6 @@ #ifndef KEYEVENTDEFS_H #define KEYEVENTDEFS_H 1 +#include void getsignaldata(int sig); void kb_trans(u_short keycode, u_short upflg); void taking_mouse_down(void); diff --git a/inc/kprintdefs.h b/inc/kprintdefs.h index 7916584..b57d33f 100644 --- a/inc/kprintdefs.h +++ b/inc/kprintdefs.h @@ -1,5 +1,6 @@ #ifndef KPRINTDEFS_H #define KPRINTDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ void prindatum(LispPTR x); LispPTR print(LispPTR x); void print_NEWstring(LispPTR x); diff --git a/inc/ldeXdefs.h b/inc/ldeXdefs.h index ce08ebb..697c75c 100755 --- a/inc/ldeXdefs.h +++ b/inc/ldeXdefs.h @@ -5,8 +5,6 @@ /* * * * * X defs for all files in Medley * * * * */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ @@ -14,8 +12,6 @@ /* */ /************************************************************************/ - -#include #ifdef LOCK_X_UPDATES #define XLOCK { XLocked++; /* printf("L"); fflush(stdout);*/} #define XUNLOCK \ diff --git a/inc/lineblt8defs.h b/inc/lineblt8defs.h index feb801b..299a35c 100644 --- a/inc/lineblt8defs.h +++ b/inc/lineblt8defs.h @@ -1,5 +1,7 @@ #ifndef LINEBLT8DEFS_H #define LINEBLT8DEFS_H 1 +#include /* for u_char */ +#include "lispemul.h" /* for LispPTR, DLword */ void lineBlt8(DLword *srcbase, register int offset, register u_char *destl, register int width, u_char color0, u_char color1, LispPTR sourcetype, LispPTR operation); #endif diff --git a/inc/lisp2cdefs.h b/inc/lisp2cdefs.h index 06eb075..2454cad 100644 --- a/inc/lisp2cdefs.h +++ b/inc/lisp2cdefs.h @@ -1,5 +1,6 @@ #ifndef LISP2CDEFS_H #define LISP2CDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ int LispStringP(LispPTR object); int LispStringLength(LispPTR lispstring); void LispStringToCStr(LispPTR lispstring, char *cstring); diff --git a/inc/lispemul.h b/inc/lispemul.h index 5d6b44f..8641af4 100644 --- a/inc/lispemul.h +++ b/inc/lispemul.h @@ -9,6 +9,7 @@ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "version.h" /* for BIGVM, BIGATOMS, UNSIGNED, UNALIGNED_FETCH_OK */ #ifndef BYTESWAP /*** Normal byte-order type decls */ @@ -329,15 +330,6 @@ extern struct state MachineState; #define Scratch_CSTK (MState->scratch_cstk) #define Error_Exit (MState->errorexit) -/* Typedef for IFPAGE */ -#include "ifpage.h" - -/* Typedef for IOPAGE */ -#include "iopage.h" - -/* Typedef for MISCSTAT */ -#include "miscstat.h" - /**************************************************** MakeAddr: base: DLword* @@ -442,8 +434,6 @@ DOSTACKOVERFLOW(argnum,bytenum) if it needs hardreturn-cleanup /************************************************************************/ /* All external functions defined in xxx.c now declared in xxxdefs.h */ -#include - /************************************************************************/ /* */ /* E R R O R & T I M E R P U N T C A S E S */ @@ -519,8 +509,10 @@ DOSTACKOVERFLOW(argnum,bytenum) if it needs hardreturn-cleanup #define MAXPNCHARS 255 /* Maximum length of PnChars */ +#ifndef FALSE #define FALSE 0 #define TRUE !FALSE +#endif typedef unsigned int boolean; diff --git a/inc/llcolordefs.h b/inc/llcolordefs.h index 123f804..8a1ffd4 100644 --- a/inc/llcolordefs.h +++ b/inc/llcolordefs.h @@ -1,5 +1,6 @@ #ifndef LLCOLORDEFS_H #define LLCOLORDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR cgfour_init_color_display(LispPTR color_bitmapbase); LispPTR cgfour_change_screen_mode(LispPTR which_screen); LispPTR cgfour_set_colormap(LispPTR args[]); diff --git a/inc/lldsp.h b/inc/lldsp.h index 1d41e0e..9652dee 100644 --- a/inc/lldsp.h +++ b/inc/lldsp.h @@ -2,8 +2,6 @@ #define LLDSP_H 1 /* $Id: lldsp.h,v 1.2 1999/01/03 02:06:09 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ @@ -11,7 +9,6 @@ /* */ /************************************************************************/ - /***************************************************************/ /* lldsp.h @@ -22,6 +19,9 @@ */ /***************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ +#include "version.h" /* for BIGVM */ + #ifndef BYTESWAP #ifdef BIGVM typedef struct { diff --git a/inc/llstkdefs.h b/inc/llstkdefs.h index 1f9abd7..01a6d1e 100644 --- a/inc/llstkdefs.h +++ b/inc/llstkdefs.h @@ -1,6 +1,7 @@ #ifndef LLSTKDEFS_H #define LLSTKDEFS_H 1 -#include "stack.h" +#include "lispemul.h" /* for DLword */ +#include "stack.h" /* for FX, StackWord, Bframe */ int do_stackoverflow(int incallp); DLword *freestackblock(DLword n, StackWord *start68k, int align); void decusecount68k(register FX *frame68k); diff --git a/inc/locfile.h b/inc/locfile.h index aa7b22f..95e509d 100644 --- a/inc/locfile.h +++ b/inc/locfile.h @@ -2,16 +2,13 @@ #define LOCFILE_H 1 /* $Id: locfile.h,v 1.2 1999/01/03 02:06:13 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - /************************************************************************/ /* */ /* (C) Copyright 1989-94 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - +#include "lispemul.h" /* for DLword */ #define FDEV_PAGE_SIZE 512 /* 1 page == 512 byte */ diff --git a/inc/loopsopsdefs.h b/inc/loopsopsdefs.h index ee5c2e7..36b2ee4 100644 --- a/inc/loopsopsdefs.h +++ b/inc/loopsopsdefs.h @@ -1,5 +1,6 @@ #ifndef LOOPSOPSDEFS_H #define LOOPSOPSDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR lcfuncall(register unsigned int atom_index, register int argnum, register int bytenum); LispPTR LCinit(void); LispPTR LCFetchMethod(register LispPTR class, register LispPTR selector); diff --git a/inc/lowlev1defs.h b/inc/lowlev1defs.h index 9ef8bb2..322527e 100644 --- a/inc/lowlev1defs.h +++ b/inc/lowlev1defs.h @@ -1,5 +1,6 @@ #ifndef LOWLEV1DEFS_H #define LOWLEV1DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_putbitsnfd(register LispPTR base, register LispPTR data, int word_offset, register int beta); LispPTR N_OP_getbitsnfd(int base_addr, register int word_offset, int beta); LispPTR N_OP_putbasen(register LispPTR base, register LispPTR tos, int n); diff --git a/inc/lowlev2defs.h b/inc/lowlev2defs.h index 80009da..d9c3db1 100644 --- a/inc/lowlev2defs.h +++ b/inc/lowlev2defs.h @@ -1,5 +1,6 @@ #ifndef LOWLEV2DEFS_H #define LOWLEV2DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_addbase(register int base, register int offset); LispPTR N_OP_getbasebyte(register LispPTR base_addr, register int byteoffset); LispPTR N_OP_putbasebyte(register LispPTR base_addr, register int byteoffset, register int tos); diff --git a/inc/lspglob.h b/inc/lspglob.h index df38ea7..025e2f6 100755 --- a/inc/lspglob.h +++ b/inc/lspglob.h @@ -3,8 +3,6 @@ /* $Id: lspglob.h,v 1.2 1999/01/03 02:06:15 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ @@ -27,6 +25,11 @@ Changed : Jul 02 1987 take */ /**********************************************************************/ +#include "version.h" /* for BIGVM */ +#include "ifpage.h" /* for IFPAGE */ +#include "iopage.h" /* for IOPAGE */ +#include "lispemul.h" /* for LispPTR, DLword */ +#include "miscstat.h" /* for MISCSTAT */ extern DLword *Atomspace; /* ATOMSPACE */ extern DLword *Stackspace; /* STACKSPACE*/ diff --git a/inc/lsptypes.h b/inc/lsptypes.h index 5b604ec..8b4d5d7 100644 --- a/inc/lsptypes.h +++ b/inc/lsptypes.h @@ -2,8 +2,6 @@ #define LSPTYPES_H 1 /* @(#) lsptypes.h Version 1.4 (12/29/94). copyright Venue */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ @@ -19,6 +17,8 @@ */ /**********************************************************************/ +#include "version.h" /* for BIGVM, BIGATOMS */ +#include "lispemul.h" /* for LispPTR, DLword */ /************************************************************************/ /* */ diff --git a/inc/lsthandldefs.h b/inc/lsthandldefs.h index b8beb02..aa97448 100644 --- a/inc/lsthandldefs.h +++ b/inc/lsthandldefs.h @@ -1,5 +1,6 @@ #ifndef LSTHANDLDEFS_H #define LSTHANDLDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_fmemb(register LispPTR item, register LispPTR tos); LispPTR fmemb(register LispPTR item, register LispPTR list); LispPTR N_OP_listget(register LispPTR plist, register LispPTR tos); diff --git a/inc/misc7defs.h b/inc/misc7defs.h index 3cbdfa3..8795a88 100644 --- a/inc/misc7defs.h +++ b/inc/misc7defs.h @@ -1,4 +1,5 @@ #ifndef MISC7DEFS_H #define MISC7DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispPTR arg5, LispPTR arg6, LispPTR arg7, int alpha); #endif diff --git a/inc/mkatomdefs.h b/inc/mkatomdefs.h index 17c9d58..dd954bc 100644 --- a/inc/mkatomdefs.h +++ b/inc/mkatomdefs.h @@ -1,5 +1,6 @@ #ifndef MKATOMDEFS_H #define MKATOMDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ DLword compute_hash(const char *char_base, DLword offset, DLword length); DLword compute_lisp_hash(const char *char_base, DLword offset, DLword length, DLword fatp); LispPTR compare_chars(register const char *char1, register const char *char2, register DLword length); diff --git a/inc/mkcelldefs.h b/inc/mkcelldefs.h index 256f3f9..b2ba6d8 100644 --- a/inc/mkcelldefs.h +++ b/inc/mkcelldefs.h @@ -1,5 +1,6 @@ #ifndef MKCELLDEFS_H #define MKCELLDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ LispPTR N_OP_createcell(register LispPTR tos); DLword *createcell68k(unsigned int type); LispPTR Create_n_Set_Cell(unsigned int type, LispPTR value); diff --git a/inc/mnxdefs.h b/inc/mnxdefs.h index 8fc2b17..5fc3580 100644 --- a/inc/mnxdefs.h +++ b/inc/mnxdefs.h @@ -2,10 +2,6 @@ #define MNXDEFS_H 1 /* $Id: mnxdefs.h,v 1.2 1999/01/03 02:06:17 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - - /************************************************************************/ /* */ /* (C) Copyright 1989, 1990, 1990, 1991, 1992, 1993, 1994, 1995 Venue. */ @@ -13,10 +9,10 @@ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - - +#include /* for Pixmap */ +#include /* for Widget */ +#include /* for */ #ifdef XTK -#include #include #include #include @@ -26,6 +22,8 @@ #include #endif /* XTK */ +#include "lispemul.h" /* for LispPTR */ + typedef void (*PFV)(); /* Pointer to Function returning Void */ typedef int (*PFI)(); /* Pointer to Function returning Int */ typedef char (*PFC)(); /* Pointer to Function returning Char */ diff --git a/inc/mvsdefs.h b/inc/mvsdefs.h index 1e5c116..848d699 100644 --- a/inc/mvsdefs.h +++ b/inc/mvsdefs.h @@ -1,6 +1,7 @@ #ifndef MVSDEFS_H #define MVSDEFS_H 1 -#include "stack.h" +#include "lispemul.h" /* for LispPTR */ +#include "stack.h" /* for FX2 */ LispPTR make_value_list(int argcount, LispPTR *argarray); void simulate_unbind(FX2 *frame, int unbind_count, FX2 *returner); LispPTR values(int arg_count, register LispPTR *args); diff --git a/inc/my.h b/inc/my.h index 3da8c4d..3efac58 100644 --- a/inc/my.h +++ b/inc/my.h @@ -10,15 +10,16 @@ /* */ /************************************************************************/ - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "adr68k.h" /* for Addr68k_from_LADDR */ +#include "lispemul.h" /* for LispPTR, DLword */ +#include "lispmap.h" /* for S_NEGATIVE, S_POSITIVE */ +#include "lsptypes.h" /* for GETWORD */ #define S_CHARACTER 0x70000 #ifdef BIGVM diff --git a/inc/osmsgdefs.h b/inc/osmsgdefs.h index 119f85c..d92d3fa 100644 --- a/inc/osmsgdefs.h +++ b/inc/osmsgdefs.h @@ -1,5 +1,6 @@ #ifndef OSMSGDEFS_H #define OSMSGDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ void mess_init(void); void mess_reset(void); LispPTR mess_read(LispPTR *args); diff --git a/inc/picture.h b/inc/picture.h index 5c957be..e72f30e 100644 --- a/inc/picture.h +++ b/inc/picture.h @@ -2,14 +2,13 @@ #define PICTURE_H 1 /* $Id: picture.h,v 1.2 1999/01/03 02:06:20 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-98 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword */ typedef struct _picture{ DLword width; diff --git a/inc/pilotbbt.h b/inc/pilotbbt.h index aee3928..6762271 100644 --- a/inc/pilotbbt.h +++ b/inc/pilotbbt.h @@ -2,9 +2,6 @@ #define PILOTBBT_H 1 /* $Id: pilotbbt.h,v 1.2 1999/01/03 02:06:21 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ @@ -12,13 +9,12 @@ /* */ /************************************************************************/ - - /**************************************************************** * * * pilotbbt.h July 6, 1987 by Osamu Nakamura * * * ****************************************************************/ +#include "lispemul.h" /* for DLword */ #ifndef BYTESWAP /**********************************/ diff --git a/inc/rawrs232c.h b/inc/rawrs232c.h index ed4fe0d..f54c376 100644 --- a/inc/rawrs232c.h +++ b/inc/rawrs232c.h @@ -2,14 +2,13 @@ #define RAWRS232C_H 1 /* $Id: rawrs232c.h,v 1.2 1999/01/03 02:06:22 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-96 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for LispPTR */ typedef struct raw232cparam { LispPTR BauRate; diff --git a/inc/returndefs.h b/inc/returndefs.h index 59f61d6..ed84194 100644 --- a/inc/returndefs.h +++ b/inc/returndefs.h @@ -1,5 +1,6 @@ #ifndef RETURNDEFS_H #define RETURNDEFS_H 1 +#include "lispemul.h" /* for DLword */ void OP_contextsw(void); void contextsw(register DLword fxnum, register DLword bytenum, register DLword flags); #endif diff --git a/inc/rpcdefs.h b/inc/rpcdefs.h index 338966e..f10522f 100644 --- a/inc/rpcdefs.h +++ b/inc/rpcdefs.h @@ -1,4 +1,5 @@ #ifndef RPCDEFS_H #define RPCDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR rpc(LispPTR *args); #endif diff --git a/inc/rplconsdefs.h b/inc/rplconsdefs.h index 1e27919..679a896 100644 --- a/inc/rplconsdefs.h +++ b/inc/rplconsdefs.h @@ -1,4 +1,5 @@ #ifndef RPLCONSDEFS_H #define RPLCONSDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_rplcons(register LispPTR list, register LispPTR item); #endif diff --git a/inc/rs232c.h b/inc/rs232c.h index 69af9fc..8a74562 100755 --- a/inc/rs232c.h +++ b/inc/rs232c.h @@ -12,13 +12,7 @@ /* */ /************************************************************************/ -#include -#include -#include - -#include "lispemul.h" -#include "adr68k.h" -#include "lispmap.h" +#include "lispemul.h" /* for LispPTR, DLword, DLbyte */ /* RS232C Buffer Status diff --git a/inc/shiftdefs.h b/inc/shiftdefs.h index 5319f5b..8c0f023 100644 --- a/inc/shiftdefs.h +++ b/inc/shiftdefs.h @@ -1,5 +1,6 @@ #ifndef SHIFTDEFS_H #define SHIFTDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_llsh1(int a); LispPTR N_OP_llsh8(int a); LispPTR N_OP_lrsh1(int a); diff --git a/inc/stack.h b/inc/stack.h index e6e2af4..14ae64c 100644 --- a/inc/stack.h +++ b/inc/stack.h @@ -8,6 +8,8 @@ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for LispPTR, DLword, FRAMESIZE, DLWORDSPER_CELL */ +#include "version.h" /* for BIGVM, UNSIGNED */ /* ContextSW frame number */ #define CurrentFXP 0 diff --git a/inc/storagedefs.h b/inc/storagedefs.h index 5fc7109..10253d8 100644 --- a/inc/storagedefs.h +++ b/inc/storagedefs.h @@ -1,5 +1,6 @@ #ifndef STORAGEDEFS_H #define STORAGEDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ void checkfor_storagefull(register unsigned int npages); LispPTR newpage(LispPTR base); void init_storage(void); diff --git a/inc/stream.h b/inc/stream.h index 10e5575..d11a0ea 100644 --- a/inc/stream.h +++ b/inc/stream.h @@ -2,15 +2,14 @@ #define STREAM_H 1 /* $Id: stream.h,v 1.2 1999/01/03 02:06:23 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-92 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ - +#include "version.h" /* for BIGVM */ +#include "lispemul.h" /* for LispPTR, DLword, DLbyte */ #ifndef BYTESWAP /********************************/ diff --git a/inc/subr0374defs.h b/inc/subr0374defs.h index bfed141..ca36a75 100644 --- a/inc/subr0374defs.h +++ b/inc/subr0374defs.h @@ -1,4 +1,5 @@ #ifndef SUBR0374DEFS_H #define SUBR0374DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR subr_k_trace(LispPTR *args); #endif diff --git a/inc/subrdefs.h b/inc/subrdefs.h index ace9a20..205f327 100644 --- a/inc/subrdefs.h +++ b/inc/subrdefs.h @@ -1,5 +1,6 @@ #ifndef SUBRDEFS_H #define SUBRDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ char *atom_to_str(LispPTR atom_index); void OP_subrcall(int subr_no, int argnum); #endif diff --git a/inc/sxhashdefs.h b/inc/sxhashdefs.h index 42c1ecf..1e3f4eb 100644 --- a/inc/sxhashdefs.h +++ b/inc/sxhashdefs.h @@ -1,5 +1,6 @@ #ifndef SXHASHDEFS_H #define SXHASHDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR SX_hash(LispPTR object); LispPTR STRING_EQUAL_HASHBITS(LispPTR object); LispPTR STRING_HASHBITS(LispPTR object); diff --git a/inc/testtooldefs.h b/inc/testtooldefs.h index 492b198..4757982 100644 --- a/inc/testtooldefs.h +++ b/inc/testtooldefs.h @@ -1,7 +1,8 @@ #ifndef TESTTOOLDEFS_H #define TESTTOOLDEFS_H 1 -#include "stack.h" -#include "cell.h" +#include "lispemul.h" /* for LispPTR, DLword, DLbyte */ +#include "cell.h" /* for conspage */ +#include "stack.h" /* for frameex1, FX, Bframe, fnhead */ void print_package_name(int index); void print_atomname(LispPTR index); int find_package_from_name(const char *packname, int len); diff --git a/inc/timeout.h b/inc/timeout.h index e6e3908..0579131 100644 --- a/inc/timeout.h +++ b/inc/timeout.h @@ -2,26 +2,21 @@ #define TIMEOUT_H 1 /* $Id: timeout.h,v 1.2 1999/01/03 02:06:27 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-98 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "setjmp.h" /* for jmp_buf */ extern jmp_buf jmpbuf; - - - /*** TIMEOUT_TIME is changeable by UNIX env var LDEFILETIMEOUT. #define TIMEOUT_TIME 10 **/ extern int TIMEOUT_TIME; - #define SETJMP(x) \ { \ if(setjmp(jmpbuf) != 0) return(x); \ diff --git a/inc/timerdefs.h b/inc/timerdefs.h index 3961c6b..9f7da82 100644 --- a/inc/timerdefs.h +++ b/inc/timerdefs.h @@ -1,5 +1,6 @@ #ifndef TIMERDEFS_H #define TIMERDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ void update_miscstats(void); void init_miscstats(void); LispPTR subr_gettime(LispPTR args[]); diff --git a/inc/tty.h b/inc/tty.h index acf5d4a..5ad1582 100644 --- a/inc/tty.h +++ b/inc/tty.h @@ -2,14 +2,13 @@ #define TTY_H 1 /* $Id: tty.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - /************************************************************************/ /* */ /* (C) Copyright 1989-96 Venue. All Rights Reserved. */ /* Manufactured in the United States of America. */ /* */ /************************************************************************/ +#include "lispemul.h" /* for DLword */ /* TTY Command diff --git a/inc/typeofdefs.h b/inc/typeofdefs.h index 23296bf..a029dc9 100644 --- a/inc/typeofdefs.h +++ b/inc/typeofdefs.h @@ -1,5 +1,6 @@ #ifndef TYPEOFDEFS_H #define TYPEOFDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_dtest(register LispPTR tos, register int atom_index); LispPTR N_OP_instancep(register LispPTR tos, register int atom_index); #endif diff --git a/inc/ubf1defs.h b/inc/ubf1defs.h index 8666de8..041b9b4 100644 --- a/inc/ubf1defs.h +++ b/inc/ubf1defs.h @@ -1,4 +1,5 @@ #ifndef UBF1DEFS_H #define UBF1DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_ubfloat1(int arg, int alpha); #endif diff --git a/inc/ubf2defs.h b/inc/ubf2defs.h index cd55ca7..d7d6bac 100644 --- a/inc/ubf2defs.h +++ b/inc/ubf2defs.h @@ -1,4 +1,5 @@ #ifndef UBF2DEFS_H #define UBF2DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_ubfloat2(int a2, int a1, int alpha); #endif diff --git a/inc/ubf3defs.h b/inc/ubf3defs.h index 4690197..85edc42 100644 --- a/inc/ubf3defs.h +++ b/inc/ubf3defs.h @@ -1,4 +1,5 @@ #ifndef UBF3DEFS_H #define UBF3DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_ubfloat3(int arg3, LispPTR arg2, LispPTR arg1, int alpha); #endif diff --git a/inc/ufsdefs.h b/inc/ufsdefs.h index 85d6363..ca95197 100644 --- a/inc/ufsdefs.h +++ b/inc/ufsdefs.h @@ -1,5 +1,6 @@ #ifndef UFSDEFS_H #define UFSDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR UFS_getfilename(LispPTR *args); LispPTR UFS_deletefile(LispPTR *args); LispPTR UFS_renamefile(LispPTR *args); diff --git a/inc/unixcommdefs.h b/inc/unixcommdefs.h index f83ae21..b0992c7 100644 --- a/inc/unixcommdefs.h +++ b/inc/unixcommdefs.h @@ -1,5 +1,6 @@ #ifndef UNIXCOMMDEFS_H #define UNIXCOMMDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ int find_process_slot(register int pid); void wait_for_comm_processes(void); char *build_socket_pathname(int desc); diff --git a/inc/unwinddefs.h b/inc/unwinddefs.h index cf8caaf..3dc5f17 100644 --- a/inc/unwinddefs.h +++ b/inc/unwinddefs.h @@ -1,4 +1,5 @@ #ifndef UNWINDDEFS_H #define UNWINDDEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR *N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep); #endif diff --git a/inc/uraiddefs.h b/inc/uraiddefs.h index 044927b..de95b5f 100644 --- a/inc/uraiddefs.h +++ b/inc/uraiddefs.h @@ -1,5 +1,6 @@ #ifndef URAIDDEFS_H #define URAIDDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ LispPTR parse_atomstring(char *string); void uraid_commclear(void); void copy_region(const DLword *src, DLword *dst, int width, int h); diff --git a/inc/uutilsdefs.h b/inc/uutilsdefs.h index 92b6c06..1c1968a 100644 --- a/inc/uutilsdefs.h +++ b/inc/uutilsdefs.h @@ -1,5 +1,7 @@ #ifndef UUTILSDEFS_H #define UUTILSDEFS_H 1 +#include /* for size_t */ +#include "lispemul.h" /* for LispPTR */ int lisp_string_to_c_string(LispPTR Lisp, char *C, size_t length); int c_string_to_lisp_string(char *C, LispPTR Lisp); LispPTR check_unix_password(LispPTR *args); diff --git a/inc/vars3defs.h b/inc/vars3defs.h index c370c5b..794eda0 100644 --- a/inc/vars3defs.h +++ b/inc/vars3defs.h @@ -1,5 +1,7 @@ #ifndef VARS3DEFS_H #define VARS3DEFS_H 1 +#include "cell.h" /* for cadr_cell */ +#include "lispemul.h" /* for LispPTR */ struct cadr_cell cadr(LispPTR cell_adr); LispPTR N_OP_arg0(register LispPTR tos); LispPTR N_OP_assoc(register LispPTR key, register LispPTR list); diff --git a/inc/vmemsavedefs.h b/inc/vmemsavedefs.h index b4e20db..28bbd27 100644 --- a/inc/vmemsavedefs.h +++ b/inc/vmemsavedefs.h @@ -1,5 +1,6 @@ #ifndef VMEMSAVEDEFS_H #define VMEMSAVEDEFS_H 1 +#include "lispemul.h" /* for LispPTR, DLword */ int lispstringP(LispPTR Lisp); LispPTR vmem_save(char *sysout_file_name); LispPTR vmem_save0(LispPTR *args); diff --git a/inc/xbbtdefs.h b/inc/xbbtdefs.h index a3dc220..0e33c44 100644 --- a/inc/xbbtdefs.h +++ b/inc/xbbtdefs.h @@ -1,4 +1,6 @@ #ifndef XBBTDEFS_H #define XBBTDEFS_H 1 +#include "devif.h" /* for DspInterface */ +#include "lispemul.h" /* for DLword */ unsigned long clipping_Xbitblt(DspInterface dsp, DLword *dummy, int x, int y, int w, int h); #endif diff --git a/inc/xcursordefs.h b/inc/xcursordefs.h index c9b8a02..a72d5cb 100644 --- a/inc/xcursordefs.h +++ b/inc/xcursordefs.h @@ -1,8 +1,9 @@ #ifndef XCURSORDEFS_H #define XCURSORDEFS_H 1 -#include -#include -#include "devif.h" +#include /* for Cursor, Window */ +#include /* for Display */ +#include /* for uint8_t */ +#include "devif.h" /* for DspInterface */ void Init_XCursor(void); void Set_XCursor(int x, int y); void init_Xcursor(Display *display, Window window); diff --git a/inc/xinitdefs.h b/inc/xinitdefs.h index 1cf7a04..2bd7de6 100644 --- a/inc/xinitdefs.h +++ b/inc/xinitdefs.h @@ -1,5 +1,6 @@ #ifndef XINITDEFS_H #define XINITDEFS_H 1 +#include "devif.h" /* for DspInterface */ void init_Xevent(DspInterface dsp); void lisp_Xexit(DspInterface dsp); void Xevent_before_raid(DspInterface dsp); diff --git a/inc/xmkicondefs.h b/inc/xmkicondefs.h index 4db912c..0037b10 100644 --- a/inc/xmkicondefs.h +++ b/inc/xmkicondefs.h @@ -1,4 +1,6 @@ #ifndef XMKICONDEFS_H #define XMKICONDEFS_H 1 +#include /* for Pixmap */ +#include "devif.h" /* for DspInterface */ Pixmap make_Xicon(DspInterface dsp); #endif diff --git a/inc/xscroll.h b/inc/xscroll.h index abb1f51..4e9313e 100644 --- a/inc/xscroll.h +++ b/inc/xscroll.h @@ -7,7 +7,7 @@ /* Scrolling functions implemented in xscroll.c */ /* */ /************************************************************************/ - +#include "devif.h" /* for DspInterface */ void Scroll(DspInterface dsp, int newX, int newY); void JumpScrollVer(DspInterface dsp, int y); void JumpScrollHor(DspInterface dsp, int x); diff --git a/inc/xscrolldefs.h b/inc/xscrolldefs.h index dd9df67..af56221 100644 --- a/inc/xscrolldefs.h +++ b/inc/xscrolldefs.h @@ -1,5 +1,6 @@ #ifndef XSCROLLDEFS_H #define XSCROLLDEFS_H 1 +#include "devif.h" /* for DspInterface */ void Scroll(DspInterface dsp, int newX, int newY); void JumpScrollVer(DspInterface dsp, int y); void JumpScrollHor(DspInterface dsp, int x); diff --git a/inc/xwinmandefs.h b/inc/xwinmandefs.h index 93a47af..4729897 100644 --- a/inc/xwinmandefs.h +++ b/inc/xwinmandefs.h @@ -1,7 +1,8 @@ #ifndef XWINMANDEFS_H #define XWINMANDEFS_H 1 -#include -#include "devif.h" +#include /* for Window */ +#include /* for XButtonEvent */ +#include "devif.h" /* for DspInterface */ int bound(int a, int b, int c); void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int grav); void enable_Xkeyboard(DspInterface dsp); diff --git a/inc/z2defs.h b/inc/z2defs.h index 4460a76..52c8d54 100644 --- a/inc/z2defs.h +++ b/inc/z2defs.h @@ -1,5 +1,6 @@ #ifndef Z2DEFS_H #define Z2DEFS_H 1 +#include "lispemul.h" /* for LispPTR */ LispPTR N_OP_classoc(LispPTR key, LispPTR list); LispPTR N_OP_clfmemb(register LispPTR item, register LispPTR list); LispPTR N_OP_restlist(register LispPTR tail, register int last, register int skip); diff --git a/src/bbtsub.c b/src/bbtsub.c index 0f31c31..f0f7635 100644 --- a/src/bbtsub.c +++ b/src/bbtsub.c @@ -25,6 +25,7 @@ #include "version.h" #include +#include #ifdef XWINDOW #ifndef DOS diff --git a/src/common.c b/src/common.c index 4322338..486bcce 100644 --- a/src/common.c +++ b/src/common.c @@ -12,6 +12,7 @@ #include "version.h" #include +#include #include #include #include /* for memset */ diff --git a/src/conspage.c b/src/conspage.c index de8491c..2be0fe4 100644 --- a/src/conspage.c +++ b/src/conspage.c @@ -14,6 +14,7 @@ * @file conspage.c */ +#include #include "lispemul.h" #include "address.h" #include "adr68k.h" diff --git a/src/draw.c b/src/draw.c index d6efa2c..7fb646c 100644 --- a/src/draw.c +++ b/src/draw.c @@ -18,6 +18,7 @@ #include "version.h" #include +#include #ifdef SUNDISPLAY #include diff --git a/src/dspif.c b/src/dspif.c index 41fada7..fa75c04 100644 --- a/src/dspif.c +++ b/src/dspif.c @@ -13,6 +13,7 @@ #include "version.h" #include +#include #include "lispemul.h" #include "dbprint.h" #include "devif.h" diff --git a/src/lisp2c.c b/src/lisp2c.c index 1f73d64..30059b0 100644 --- a/src/lisp2c.c +++ b/src/lisp2c.c @@ -13,6 +13,7 @@ #include "version.h" #include /* for sprintf */ +#include #include "lispemul.h" #include "lspglob.h" diff --git a/src/rs232c.c b/src/rs232c.c index 66c2427..0ceb13e 100644 --- a/src/rs232c.c +++ b/src/rs232c.c @@ -9,9 +9,15 @@ /************************************************************************/ #include "version.h" -#include "rs232c.h" -#include "lspglob.h" + +#include +#include +#include #include + +#include "lspglob.h" +#include "rs232c.h" + /* * Lisp Interface */ diff --git a/src/setsout.c b/src/setsout.c index d0d5521..2d4305d 100644 --- a/src/setsout.c +++ b/src/setsout.c @@ -21,6 +21,7 @@ /************************************************************************/ #include +#include #include #include #include diff --git a/src/testtool.c b/src/testtool.c index cc8975d..a1579aa 100644 --- a/src/testtool.c +++ b/src/testtool.c @@ -43,6 +43,7 @@ */ #include #include +#include #include #include "lispemul.h" diff --git a/src/tstsout.c b/src/tstsout.c index f1f0780..91dd19e 100644 --- a/src/tstsout.c +++ b/src/tstsout.c @@ -14,6 +14,7 @@ #include "version.h" #include +#include #include #include #include diff --git a/src/vmemsave.c b/src/vmemsave.c index ada1fd6..651e1ad 100644 --- a/src/vmemsave.c +++ b/src/vmemsave.c @@ -21,7 +21,7 @@ #include #include #include - +#include #ifndef DOS #include #include diff --git a/src/xwinman.c b/src/xwinman.c index ee6b78c..b5b8e65 100644 --- a/src/xwinman.c +++ b/src/xwinman.c @@ -17,6 +17,7 @@ #include #include "lispemul.h" +#include "miscstat.h" #include "devif.h" #include "xdefs.h" #include "xscroll.h"