Sanity check various type (mostly structs) sizes.

TODO

@@ -1,8 +1,5 @@
-        Look into fixes for the bad padding we're getting on Mac OS X PPC
+        Fix the bad padding we're getting on Mac OS X PPC (put PACKED after
-
+        struct)
-                fcbrec definitely kills us, others may too
-
-                further populate check_structs.c
 
 	package up the System Folder and whatnot so that people w/o the
 	old executor-aux can run Executor

src/AE_desc.c

@@ -13,6 +13,7 @@ char ROMlib_rcsid_AE_desc[] =
 #include "MemoryMgr.h"
 
 #include "rsys/mman.h"
+#include "rsys/apple_events.h"
 
 #define LIST_CLASS_P(desc) \
   (   DESC_TYPE_X (desc) == CLC (typeAEList)	\
@@ -24,113 +25,6 @@ char ROMlib_rcsid_AE_desc[] =
 #define APPLE_EVENT_CLASS_P(desc) \
   (DESC_TYPE_X (desc) == CLC (typeAppleEvent))
 
-/* #### internal */
-
-typedef struct
-{
-  DescType type			PACKED;
-  uint32 size			PACKED;
-  char data[0]			LPACKED;
-} inline_desc_t;
-
-typedef struct
-{
-  int32 key			PACKED;
-  DescType type			PACKED;
-  uint32 size			PACKED;
-  char data[0]			LPACKED;
-} inline_key_desc_t;
-
-typedef struct list_header
-{
-  /* #### always zero (?) */
-  uint32 unknown_1		PACKED;
-  
-  /* #### contains an applzone address */
-  uint32 unknown_2		PACKED;
-  
-  uint32 param_offset		PACKED;
-  
-  /* contains a tick that identifies the object, either `list' or
-     `reco'; for an apple event, this fiend contains the offset to the
-     parameter section */
-  uint32 attribute_count	PACKED;
-  
-  uint32 param_count		PACKED;
-  
-  /* ### always zero (?) */
-  int32 unknown_3		PACKED;
-  
-   /* offset: 0x18 */
-  char data[0]			LPACKED;
-} list_header_t;
-
-typedef struct { list_header_t *p PACKED_P; } hidden_list_header_ptr;
-typedef hidden_list_header_ptr *list_header_h;
-
-#define PARAM_OFFSET_X(aggr_desc_h)					\
-  (HxX ((list_header_h) aggr_desc_h, param_offset))
-#define PARAM_COUNT_X(aggr_desc_h)					\
-  (HxX ((list_header_h) aggr_desc_h, param_count))
-#define ATTRIBUTE_COUNT_X(aggr_desc_h)					\
-  (HxX ((list_header_h) aggr_desc_h, attribute_count))
-
-#define PARAM_COUNT(aggr_desc_h)	(CL (PARAM_COUNT_X (aggr_desc_h)))
-#define PARAM_OFFSET(aggr_desc_h)	(CL (PARAM_OFFSET_X (aggr_desc_h)))
-#define ATTRIBUTE_COUNT(aggr_desc_h)	(CL (ATTRIBUTE_COUNT_X (aggr_desc_h)))
-
-typedef struct ae_header
-{
-  /* #### always zero (?) */
-  uint32 unknown_1		PACKED;
-  
-  /* #### contains unknown values */
-  uint32 unknown_2		PACKED;
-  
-  uint32 param_offset		PACKED;
-  
-  uint32 attribute_count	PACKED;
-  uint32 param_count		PACKED;
-  
-  /* #### zero pad, use unknown */
-  char pad_1[26]		LPACKED;
-  
-  AEEventClass event_class	PACKED;
-  AEEventID event_id		PACKED;
-  
-  /* #### takes on various values, no idea */
-  uint32 unknown_3		PACKED;
-  
-  /* beginning of target inline descriptor; `target->size' determines
-     target's actual size */
-  inline_desc_t target		LPACKED;
-  
-#if 0
-  /* for show */
-  /* #### contains `aevt' tick */
-  uint32 unknown_4;
-  
-  /* contains 0x00010001 */
-  uint32 unknown_5;
-  
-  char attribute_data[...];
-  
-  /* marker containing tick `;;;;' */
-  uint32 unknown_6;
-  
-  char param_data[...];
-#endif
-} ae_header_t;
-
-typedef struct subdesc_info
-{
-  int count;
-  int base_offset;
-  uint32 *count_p;
-  boolean_t key_p;
-  int inline_desc_header_size;
-} subdesc_info_t;
-
 static OSErr
 get_subdesc_info (Handle aggr_desc_h, subdesc_info_t *info,
 		  boolean_t attribute_p)

src/PSprint.c

@@ -36,7 +36,6 @@ char ROMlib_rcsid_PSprint[] =
 #include "rsys/nextprint.h"
 #include "rsys/blockinterrupts.h"
 #include "rsys/next.h"
-#include "rsys/myabort.h"
 #include "rsys/PSstrings.h"
 #include "rsys/tempalloc.h"
 

src/alias.c

@@ -23,6 +23,8 @@ char ROMlib_rcsid_alias[] =
 #include "win_temp.h"
 #endif
 
+#include "rsys/alias.h"
+
 #define paramErr	(-50)
 
 /* NOTE: if we want to be more like the Mac, we should have a 'fld#',0
@@ -379,71 +381,6 @@ enum
   TAIL_TAG = 0x0009,
 };
 
-typedef unsigned char Str27[28];
-
-typedef struct
-{
-  OSType type PACKED;
-  INTEGER length PACKED;
-  INTEGER usually_2 PACKED;
-  INTEGER usually_0 PACKED;
-  Str27 volumeName LPACKED;
-  LONGINT ioVCrDate PACKED;
-  INTEGER ioVSigWord PACKED;
-  INTEGER zero_or_one PACKED;
-  LONGINT zero_or_neg_one PACKED;
-  Str63 fileName LPACKED;
-  LONGINT ioDirID PACKED; /* -1 full */
-  LONGINT ioFlCrDat PACKED;
-  OSType type_info PACKED;
-  OSType creator PACKED;
-  INTEGER mystery_words[10] PACKED;
-}
-alias_head_t;
-
-typedef struct /* 0x0000 */
-{
-  INTEGER parent_length PACKED;
-  unsigned char parent_bytes[1] LPACKED;
-}
-alias_parent_t;
-
-typedef struct /* 0x0001 */
-{
-  INTEGER eight PACKED;
-  LONGINT mystery_longs[2] PACKED;
-}
-alias_unknown_000100_t;
-
-typedef struct /* 0x0002 */
-{
-  INTEGER fullpath_length PACKED;
-  unsigned char fullpath_bytes[1] LPACKED;
-}
-alias_fullpath_t;
-
-typedef struct /* 0x0009 */
-{
-  INTEGER length PACKED;
-  INTEGER weird_info[12] PACKED;
-  Str32 zone LPACKED;
-  Str31 server LPACKED;
-  Str27 volumeName LPACKED;
-  Str32 network_identity_owner_name LPACKED;
-  char filler_zeros[18] LPACKED;
-}
-alias_tail_t;
-
-typedef struct
-{
-  alias_head_t *headp PACKED;
-  alias_parent_t *parentp PACKED;
-  alias_unknown_000100_t *unknownp PACKED;
-  alias_fullpath_t *fullpathp PACKED;
-  alias_tail_t *tailp PACKED;
-}
-alias_parsed_t;
-
 /*
  * ResolveAlias is just a stub so we can recover the fsspecs that are stored
  * in the AppleEvent that is constructed as part of the process of launching

src/config/front-ends/nextstep/MacAppClass.m

@@ -33,7 +33,6 @@
 #include "MemoryMgr.h"
 #include "rsys/soundopts.h"
 #include "rsys/blockinterrupts.h"
-#include "rsys/screen.h"
 #include "rsys/syn68k_public.h"
 #include "rsys/prefs.h"
 #include "rsys/hfs.h"

src/config/front-ends/nextstep/NEXTmain.m

@@ -42,7 +42,6 @@
 #include "rsys/next.h"
 #include "rsys/setuid.h"
 #include "rsys/blockinterrupts.h"
-#include "rsys/screen.h"
 #include "rsys/syn68k_public.h"
 #include "ourstuff.h"
 #include "contextswitch.h"

src/config/front-ends/nextstep/OldMacViewClass.m

@@ -54,7 +54,6 @@ char ROMlib_rcsid_MacViewClass[] =
 #include "rsys/nextprint.h"
 #include "rsys/blockinterrupts.h"
 #include "rsys/next.h"
-#include "rsys/screen.h"
 #include "rsys/myabort.h"
 #include "rsys/trapglue.h"
 #include "rsys/syn68k_public.h"

src/ctlArrows.c

@@ -17,9 +17,6 @@ char ROMlib_rcsid_ctlArrows[] =
 
 #include "rsys/cquick.h"
 #include "rsys/ctl.h"
-#include "rsys/screen.h"
-
-#include "rsys/fatal.h"
 
 #include "rsys/image.h"
 #include "rsys/host.h"
@@ -695,13 +692,6 @@ restore (const save_t *sp)
   DisposHandle ((Handle) MR (sp->cp.portPixMap));
 }
 
-struct lsastr
-{
-  Rect limitRect	LPACKED;
-  Rect slopRect		LPACKED;
-  INTEGER axis		PACKED;
-};
-
 P4 (PUBLIC pascal, LONGINT, cdef16, /* IMI-328 */
     INTEGER, var, ControlHandle, c, INTEGER, mess, LONGINT, param)
 {

src/ctlInit.c

@@ -107,17 +107,6 @@ P9(PUBLIC pascal trap, ControlHandle, NewControl, WindowPtr, wst, Rect *, r,
     return retval;
 }
 
-typedef struct {
-    Rect _crect		LPACKED;
-    INTEGER _cvalue	PACKED;
-    INTEGER _cvisible	PACKED;
-    INTEGER _cmax	PACKED;
-    INTEGER _cmin	PACKED;
-    INTEGER _cprocid	PACKED;
-    LONGINT _crefcon	PACKED;
-    Byte _ctitle	LPACKED;
-} contrlrestype;
-
 P2(PUBLIC pascal trap, ControlHandle, GetNewControl,		/* IMI-321 */
 					        INTEGER, cid, WindowPtr, wst)
 {

src/ctlMouse.c

@@ -69,12 +69,6 @@ P3(PUBLIC pascal trap, INTEGER, FindControl, Point, p,	/* IMI-323 */
   return retval;
 }
 
-typedef struct {
-    Rect _tlimit	LPACKED;
-    Rect _tslop		LPACKED;
-    INTEGER _taxis	PACKED;
-} thumbstr;
-
 typedef pascal void (*actionp)(ControlHandle c, INTEGER part);
 
 A3(PRIVATE inline, void, CALLACTION, ControlHandle, ch, INTEGER, inpart,

src/ctlStddef.c

@@ -19,7 +19,6 @@ char ROMlib_rcsid_ctlStddef[] =
 
 #include "rsys/ctl.h"
 #include "rsys/cquick.h"
-#include "rsys/screen.h"
 
 
 enum

src/dialAlert.c

@@ -18,23 +18,15 @@ char ROMlib_rcsid_dialAlert[] =
 
 #include "OSUtil.h"
 #include "rsys/itm.h"
-#include "rsys/screen.h"
 #include "rsys/resource.h"
 #include "rsys/cquick.h"
 #include "rsys/mman.h"
 #include "rsys/options.h"
+#include "rsys/dial.h"
 
 int16 alert_extra_icon_id = -32768;
 
-static struct
+static icon_item_template_t icon_item_template =
-{
-  int16 count		PACKED;
-  Handle h		PACKED_P;
-  Rect r		LPACKED;
-  uint8 type		LPACKED;
-  uint8 len		LPACKED;
-  int16 res_id		PACKED;
-} icon_item_template =
 {
   /* item count - 1 */
   CWC (0),

src/dialCreate.c

@@ -25,14 +25,11 @@ char ROMlib_rcsid_dialCreate[] =
 #include "rsys/wind.h"
 #include "rsys/itm.h"
 #include "rsys/ctl.h"
-#include "rsys/screen.h"
 #include "rsys/glue.h"
 #include "rsys/mman.h"
 #include "rsys/resource.h"
 #include "rsys/host.h"
 
-#include "rsys/fatal.h"
-
 #define _PtrToHand(ptr, hand, len)			\
   ((void)						\
    ({							\

src/emustubs.c

@@ -226,13 +226,6 @@ STUB(ADBReInit)
   RTS ();
 }
 
-typedef struct
-{
-  Ptr buffer PACKED;
-  ProcPtr proc PACKED;
-  Ptr data PACKED;
-} adbop_t;
-
 STUB(ADBOp)
 {
   adbop_t *p;
@@ -1780,35 +1773,6 @@ STUB (Pack15)
   return do_selector_block (pack15_block, EM_D0 & 0xFF, Pack15);
 }
 
-typedef struct comm_toolbox_dispatch_args
-{
-  int16 selector		PACKED;
-  
-  union
-    {
-      struct
-        {
-	  int16 n_items		PACKED;
-	  DialogPtr dp		PACKED_P;
-        } shorten_args		LPACKED;
-      struct
-        {
-	  DITLMethod method	PACKED;
-	  Handle new_items_h	PACKED_P;
-	  DialogPtr dp		PACKED_P;
-        } append_args		LPACKED;
-      struct
-        {
-	  DialogPtr dp		PACKED_P;
-        } count_args;
-      struct
-        {
-	  QElemPtr qp PACKED_P;
-        } crm_args;
-	
-    } args;
-} comm_toolbox_dispatch_args_t;
-
 STUB (CommToolboxDispatch)
 {
   comm_toolbox_dispatch_args_t *arg_block;
@@ -2601,14 +2565,6 @@ STUB (MoreMasters)
   RTS ();
 }
 
-typedef struct
-{
-  void *startPtr	PACKED_P;
-  void *limitPtr	PACKED_P;
-  short cMoreMasters	PACKED;
-  void *pGrowZone	PACKED_P;
-} initzonehiddenargs_t;
-
 STUB (InitZone)
 {
   initzonehiddenargs_t *ip;

src/fileCreate.c

@@ -18,7 +18,6 @@ char ROMlib_rcsid_fileCreate[] =
 
 #include "rsys/file.h"
 #include "rsys/glue.h"
-#include "rsys/assert.h"
 #include "rsys/filedouble.h"
 #include "rsys/suffix_maps.h"
 

src/fileDouble.c

@@ -10,7 +10,6 @@ char ROMlib_rcsid_fileDouble[] =
 #include "rsys/common.h"
 #include "FileMgr.h"
 #include "rsys/file.h"
-#include "rsys/assert.h"
 
 #if defined (CYGWIN32)
 #include "winfs.h"
@@ -47,10 +46,7 @@ int apple_double_fork_prefix_length;
 #include "rsys/suffix_maps.h"
 #include "rsys/osutil.h"
 
-PRIVATE struct defaulthead {
+PRIVATE defaulthead_t ourdefault
-    Single_header head	LPACKED;
-    Single_descriptor desc[10]	LPACKED;	/* we use 4, 6 for spare */
-} ourdefault
 #if !defined(__alpha)
 = {
     {
@@ -112,11 +108,7 @@ PRIVATE void initialize_ourdefault( void )
 }
 #endif /* defined(__alpha) */
 
-PRIVATE struct defaultentries {
+PRIVATE defaultentries_t ourentries;
-    Single_attribs attribs	PACKED;
-    Single_dates   dates	LPACKED;
-    Single_finfo   finfo	LPACKED;
-} ourentries;
 
 PUBLIC void
 double_dir_op (char *name, double_dir_op_t op)

src/fileInfo.c

@@ -21,7 +21,6 @@ char ROMlib_rcsid_fileInfo[] =
 #include "rsys/glue.h"
 #include "rsys/osutil.h"
 #include "rsys/filedouble.h"
-#include "rsys/assert.h"
 #include "rsys/suffix_maps.h"
 
 #include <ctype.h>

src/fileMisc.c

@@ -22,8 +22,6 @@ char ROMlib_rcsid_fileMisc[] =
 #include "rsys/file.h"
 #include "rsys/notmac.h"
 #include "rsys/stdfile.h"
-#include "rsys/debug.h"
-#include "rsys/assert.h"
 #include "rsys/ini.h"
 #include "rsys/string.h"
 #include "rsys/custom.h"

src/fileVolumes.c

@@ -21,8 +21,6 @@ char ROMlib_rcsid_fileVolumes[] =
 #include "rsys/file.h"
 #include "rsys/glue.h"
 #include "rsys/notmac.h"
-#include "rsys/myabort.h"
-#include "rsys/assert.h"
 #include "rsys/segment.h"
 #include "rsys/string.h"
 
@@ -66,18 +64,6 @@ char ROMlib_rcsid_fileVolumes[] =
 
 #define HASHSIZE	101
 
-typedef struct {
-    LONGINT dirid;
-    INTEGER filesystemlen;
-    unsigned char hostnamelen;
-    char hostnameandroot[1];	/* potentially many more */
-} rkey_t;
-
-typedef struct {
-    LONGINT parid;
-    char path[1];	/* potentially many more */
-} rcontent_t;
-
 A2(PRIVATE, hashlink_t **, hashloc, VCBExtra *, vcbp, LONGINT, dir)
 {
     hashlink_t **hlpp;

src/font.c

@@ -264,11 +264,6 @@ INTEGER nhappybits(unsigned short want, unsigned short have)
 
 #define WIDTHBIT	(1 << 1)
 
-typedef struct {
-    unsigned short style;
-    INTEGER table[1];	/* actually more */
-} widentry_t;
-
 A0(PRIVATE, INTEGER *, findfondwidths)
 {
     INTEGER *retval, *numentriesminusone;

src/gestalt.c

@@ -16,7 +16,6 @@ char ROMlib_rcsid_gestalt[] =
 #include "rsys/prefs.h"
 #include "rsys/soundopts.h"
 #include "rsys/mman.h"
-#include "rsys/assert.h"
 #include "rsys/gestalt.h"
 #include "rsys/version.h"
 #include "rsys/vdriver.h"

src/hfsBtree.c

@@ -70,7 +70,6 @@ char ROMlib_rcsid_hfsBtree[] =
 #include "MemoryMgr.h"
 #include "ToolboxUtil.h"
 #include "rsys/hfs.h"
-#include "rsys/assert.h"
 #include "rsys/dcache.h"
 
 #include "rsys/hfs_plus.h"

src/icon.c

@@ -19,6 +19,7 @@ char ROMlib_rcsid_icon[] =
 #include "rsys/cquick.h"
 #include "rsys/resource.h"
 #include "rsys/mman.h"
+#include "rsys/icon.h"
 
 #define ICON_RETURN_ERROR(error)					      \
   ({									      \
@@ -342,20 +343,6 @@ P1 (PUBLIC pascal trap, void, DisposeCIcon,
   DisposHandle ((Handle) icon);
 }
 
-#define N_SUITE_ICONS 6
-
-/* NOTE:  Cotton didn't really use a struct and I'm not about to munch his
-   code, especially since we don't know the real layout and this is subject
-   to change.  I just wanted to paste in the flags field so we can drop a
-   label in there. */
-
-typedef struct
-{
-  Handle icons[N_SUITE_ICONS];
-  INTEGER label;
-}
-cotton_suite_layout_t;
-
 #define large_bw_icon 0
 #define small_bw_icon 3
 

src/include/OLDSANE.h

@@ -1,229 +0,0 @@
-#if !defined(__SANE__)
-#define __SANE__
-
-/*
- * Copyright 1990, 1991 by Abacus Research and Development, Inc.
- * All rights reserved.
- *
- * $Id: OLDSANE.h 63 2004-12-24 18:19:43Z ctm $
- */
-
-typedef struct {
-    INTEGER exp	PACKED;
-    INTEGER man[4]	PACKED;
-} extended80;
-
-typedef struct {
-    INTEGER exp	PACKED;
-    INTEGER zero	PACKED;
-    INTEGER man[4]	PACKED;
-} extended96;
-
-typedef struct {
-    LONGINT hilong	PACKED;
-    LONGINT lowlong	PACKED;
-} comp;
-
-#define SIGDIGLEN 20
-
-typedef struct {
-    INTEGER sgn	PACKED;
-    INTEGER exp	PACKED;
-    unsigned char sig[SIGDIGLEN]	PACKED;
-} Decimal;
-
-typedef enum { FloatDecimal, FixedDecimal = 256 } toobigdecformstyle_t;
-
-typedef INTEGER DecFormStyle;
-
-#define DECIMALTYPEMASK 0x0100
-
-typedef enum {SNaN = 1, QNaN, Infinite, ZeroNum, NormalNum, DenormalNum}
-								      NumClass;
-
-typedef struct {
-    DecFormStyle style	PACKED;
-    INTEGER  digits	PACKED;
-} DecForm;
-
-#define Decstr char *
-
-#define FX_OPERAND	0x0000
-#define FD_OPERAND	0x0800
-#define FS_OPERAND	0x1000
-#define FC_OPERAND	0x3000
-#define FI_OPERAND	0x2000
-#define FL_OPERAND	0x2800
-
-#define Fx2X_OPCODE	0x000E
-
-#define FI2X	(FI_OPERAND + Fx2X_OPCODE)
-/* DO NOT DELETE THIS LINE */
-#if !defined (__STDC__)
-extern pascal void ROMlib_Fcomp2X(); 
-extern void ROMlib_Fsetenv(); 
-extern void ROMlib_Fgetenv(); 
-extern void ROMlib_Fprocentry(); 
-extern void ROMlib_Fprocexit(); 
-extern void ROMlib_Ftestxcp(); 
-extern void ROMlib_FsqrtX(); 
-extern void ROMlib_FscalbX(); 
-extern void ROMlib_FlogbX(); 
-extern void ROMlib_FabsX(); 
-extern void ROMlib_FnegX(); 
-extern void ROMlib_FrintX(); 
-extern void ROMlib_FtintX(); 
-extern void ROMlib_Fcpysgnx(); 
-extern void ROMlib_Faddx(); 
-extern void ROMlib_Fsubx(); 
-extern void ROMlib_Fmulx(); 
-extern void ROMlib_Fdivx(); 
-extern void ROMlib_Fremx(); 
-extern void ROMlib_Fcmpx(); 
-extern void ROMlib_FcpXx(); 
-extern void ROMlib_FX2x(); 
-extern void ROMlib_Fx2X(); 
-extern void ROMlib_Fx2dec(); 
-extern void ROMlib_Fdec2x(); 
-extern void ROMlib_Fclassx(); 
-extern void ROMlib_FlnX(); 
-extern void ROMlib_Flog2X(); 
-extern void ROMlib_Fln1X(); 
-extern void ROMlib_Flog21X(); 
-extern void ROMlib_FexpX(); 
-extern void ROMlib_Fexp2X(); 
-extern void ROMlib_Fexp1X(); 
-extern void ROMlib_Fexp21X(); 
-extern void ROMlib_Fxpwri(); 
-extern void ROMlib_Fxpwry(); 
-extern void ROMlib_Fcompound(); 
-extern void ROMlib_Fannuity(); 
-extern void ROMlib_FsinX(); 
-extern void ROMlib_FcosX(); 
-extern void ROMlib_FtanX(); 
-extern void ROMlib_FatanX(); 
-extern void ROMlib_FrandX(); 
-extern void ROMlib_Fdec2str(); 
-extern void ROMlib_Fxstr2dec(); 
-extern void ROMlib_Fcstr2dec(); 
-extern void ROMlib_Fpstr2dec(); 
-#else /* __STDC__ */
-extern pascal void C_ROMlib_Fcomp2X( comp volatile sp, extended80 *
- volatile dp ); extern pascal void P_ROMlib_Fcomp2X( comp volatile sp, extended80 *
- volatile dp ); 
-extern pascal trap void C_ROMlib_Fsetenv( INTEGER *volatile dp, 
- INTEGER volatile sel ); extern pascal trap void P_ROMlib_Fsetenv( INTEGER *volatile dp, 
- INTEGER volatile sel ); 
-extern pascal trap void C_ROMlib_Fgetenv( INTEGER *volatile dp, 
- INTEGER volatile sel ); extern pascal trap void P_ROMlib_Fgetenv( INTEGER *volatile dp, 
- INTEGER volatile sel ); 
-extern pascal trap void C_ROMlib_Fprocentry( INTEGER *volatile dp, 
- INTEGER volatile sel ); extern pascal trap void P_ROMlib_Fprocentry( INTEGER *volatile dp, 
- INTEGER volatile sel ); 
-extern pascal trap void C_ROMlib_Fprocexit( INTEGER *volatile dp, 
- INTEGER volatile sel ); extern pascal trap void P_ROMlib_Fprocexit( INTEGER *volatile dp, 
- INTEGER volatile sel ); 
-extern pascal trap void C_ROMlib_Ftestxcp( INTEGER *volatile dp, 
- INTEGER volatile sel ); extern pascal trap void P_ROMlib_Ftestxcp( INTEGER *volatile dp, 
- INTEGER volatile sel ); 
-extern pascal trap void C_ROMlib_FsqrtX( extended80 *volatile dp, 
- unsigned short volatile sel ); extern pascal trap void P_ROMlib_FsqrtX( extended80 *volatile dp, 
- unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FscalbX( INTEGER *volatile sp, 
- extended80 *volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_FscalbX( INTEGER *volatile sp, 
- extended80 *volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FlogbX( extended80 *volatile dp, 
- unsigned short volatile sel ); extern pascal trap void P_ROMlib_FlogbX( extended80 *volatile dp, 
- unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FabsX( extended80 *volatile dp, 
- unsigned short volatile sel ); extern pascal trap void P_ROMlib_FabsX( extended80 *volatile dp, 
- unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FnegX( extended80 *volatile dp, 
- unsigned short volatile sel ); extern pascal trap void P_ROMlib_FnegX( extended80 *volatile dp, 
- unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FrintX( extended80 *volatile dp, 
- unsigned short volatile sel ); extern pascal trap void P_ROMlib_FrintX( extended80 *volatile dp, 
- unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FtintX( extended80 *volatile dp, 
- unsigned short volatile sel ); extern pascal trap void P_ROMlib_FtintX( extended80 *volatile dp, 
- unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fcpysgnx( float *volatile sp, 
- float *volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fcpysgnx( float *volatile sp, 
- float *volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Faddx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Faddx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fsubx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fsubx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fmulx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fmulx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fdivx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fdivx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fremx( void *volatile sp, 
- extended80 *volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fremx( void *volatile sp, 
- extended80 *volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fcmpx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fcmpx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FcpXx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_FcpXx( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FX2x( extended80 *volatile sp, void *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_FX2x( extended80 *volatile sp, void *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fx2X( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fx2X( void *volatile sp, extended80 *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fx2dec( DecForm *volatile sp2, void *
- volatile sp, Decimal *volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fx2dec( DecForm *volatile sp2, void *
- volatile sp, Decimal *volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fdec2x( Decimal *volatile sp, void *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fdec2x( Decimal *volatile sp, void *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_Fclassx( void *volatile sp, INTEGER *
- volatile dp, unsigned short volatile sel ); extern pascal trap void P_ROMlib_Fclassx( void *volatile sp, INTEGER *
- volatile dp, unsigned short volatile sel ); 
-extern pascal trap void C_ROMlib_FlnX( extended80 *volatile dp ); extern pascal trap void P_ROMlib_FlnX( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Flog2X( extended80 *volatile dp ); extern pascal trap void P_ROMlib_Flog2X( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Fln1X( extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fln1X( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Flog21X( extended80 *volatile dp ); extern pascal trap void P_ROMlib_Flog21X( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_FexpX( extended80 *volatile dp ); extern pascal trap void P_ROMlib_FexpX( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Fexp2X( extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fexp2X( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Fexp1X( extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fexp1X( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Fexp21X( extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fexp21X( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Fxpwri( INTEGER *volatile sp, 
- extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fxpwri( INTEGER *volatile sp, 
- extended80 *volatile dp ); 
-extern pascal trap void C_ROMlib_Fxpwry( extended80 *volatile sp, 
- extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fxpwry( extended80 *volatile sp, 
- extended80 *volatile dp ); 
-extern pascal trap void C_ROMlib_Fcompound( extended80 *volatile sp2, 
- extended80 *volatile sp, extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fcompound( extended80 *volatile sp2, 
- extended80 *volatile sp, extended80 *volatile dp ); 
-extern pascal trap void C_ROMlib_Fannuity( extended80 *volatile sp2, 
- extended80 *volatile sp, extended80 *volatile dp ); extern pascal trap void P_ROMlib_Fannuity( extended80 *volatile sp2, 
- extended80 *volatile sp, extended80 *volatile dp ); 
-extern pascal trap void C_ROMlib_FsinX( extended80 *volatile dp ); extern pascal trap void P_ROMlib_FsinX( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_FcosX( extended80 *volatile dp ); extern pascal trap void P_ROMlib_FcosX( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_FtanX( extended80 *volatile dp ); extern pascal trap void P_ROMlib_FtanX( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_FatanX( extended80 *volatile dp ); extern pascal trap void P_ROMlib_FatanX( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_FrandX( extended80 *volatile dp ); extern pascal trap void P_ROMlib_FrandX( extended80 *volatile dp); 
-extern pascal trap void C_ROMlib_Fdec2str( DecForm *volatile sp2, 
- Decimal *volatile sp, Decstr volatile dp ); extern pascal trap void P_ROMlib_Fdec2str( DecForm *volatile sp2, 
- Decimal *volatile sp, Decstr volatile dp ); 
-extern pascal trap void C_ROMlib_Fxstr2dec( Decstr volatile sp2, 
- INTEGER *volatile sp, Decimal *volatile dp2, Byte *volatile dp, 
- INTEGER lastchar ); extern pascal trap void P_ROMlib_Fxstr2dec( Decstr volatile sp2, 
- INTEGER *volatile sp, Decimal *volatile dp2, Byte *volatile dp, 
- INTEGER lastchar ); 
-extern pascal trap void C_ROMlib_Fcstr2dec( Decstr volatile sp2, 
- INTEGER *volatile sp, Decimal *volatile dp2, Byte *volatile dp ); extern pascal trap void P_ROMlib_Fcstr2dec( Decstr volatile sp2, 
- INTEGER *volatile sp, Decimal *volatile dp2, Byte *volatile dp ); 
-extern pascal trap void C_ROMlib_Fpstr2dec( Decstr volatile sp2, 
- INTEGER *volatile sp, Decimal *volatile dp2, Byte *volatile dp ); extern pascal trap void P_ROMlib_Fpstr2dec( Decstr volatile sp2, 
- INTEGER *volatile sp, Decimal *volatile dp2, Byte *volatile dp ); 
-#endif /* __STDC__ */
-#endif

src/include/VDriver.h

@@ -52,7 +52,7 @@ typedef VDPgInfo *VDPgInfoPtr;
 
 typedef struct
 {
-  SignedByte flag	PACKED;
+  SignedByte flag	LPACKED;
 } VDFlagRec;
 
 typedef VDFlagRec *VDFlagPtr;
@@ -60,7 +60,7 @@ typedef VDFlagRec *VDFlagPtr;
 
 typedef struct
 {
-  SignedByte spID;	PACKED;
+  SignedByte spID	LPACKED;
 } VDDefModeRec;
 
 typedef VDDefModeRec *VDDefModePtr;

src/include/pascal.h

@@ -1,3 +0,0 @@
-/*
- * $Id: pascal.h 63 2004-12-24 18:19:43Z ctm $
- */

src/include/rsys/alias.h

@@ -0,0 +1,70 @@
+#if !defined (__rsys_alias_h__)
+#  define __rsys_alias_h__
+
+typedef unsigned char Str27[28];
+
+typedef struct
+{
+  OSType type PACKED;
+  INTEGER length PACKED;
+  INTEGER usually_2 PACKED;
+  INTEGER usually_0 PACKED;
+  Str27 volumeName LPACKED;
+  LONGINT ioVCrDate PACKED;
+  INTEGER ioVSigWord PACKED;
+  INTEGER zero_or_one PACKED;
+  LONGINT zero_or_neg_one PACKED;
+  Str63 fileName LPACKED;
+  LONGINT ioDirID PACKED; /* -1 full */
+  LONGINT ioFlCrDat PACKED;
+  OSType type_info PACKED;
+  OSType creator PACKED;
+  INTEGER mystery_words[10] PACKED;
+}
+alias_head_t;
+
+typedef struct /* 0x0000 */
+{
+  INTEGER parent_length PACKED;
+  unsigned char parent_bytes[1] LPACKED;
+}
+alias_parent_t;
+
+typedef struct /* 0x0001 */
+{
+  INTEGER eight PACKED;
+  LONGINT mystery_longs[2] PACKED;
+}
+alias_unknown_000100_t;
+
+typedef struct /* 0x0002 */
+{
+  INTEGER fullpath_length PACKED;
+  unsigned char fullpath_bytes[1] LPACKED;
+}
+alias_fullpath_t;
+
+typedef struct /* 0x0009 */
+{
+  INTEGER length PACKED;
+  INTEGER weird_info[12] PACKED;
+  Str32 zone LPACKED;
+  Str31 server LPACKED;
+  Str27 volumeName LPACKED;
+  Str32 network_identity_owner_name LPACKED;
+  char filler_zeros[18] LPACKED;
+}
+alias_tail_t;
+
+typedef struct
+{
+  alias_head_t *headp PACKED;
+  alias_parent_t *parentp PACKED;
+  alias_unknown_000100_t *unknownp PACKED;
+  alias_fullpath_t *fullpathp PACKED;
+  alias_tail_t *tailp PACKED;
+}
+alias_parsed_t;
+
+
+#endif /* !defined (__rsys_alias_h__) */

src/include/rsys/apple_events.h

@@ -0,0 +1,111 @@
+#if !defined (__rsys_apple_events_h__)
+#  define __rsys_apple_events_h__
+
+/* #### internal */
+
+typedef struct
+{
+  DescType type			PACKED;
+  uint32 size			PACKED;
+  char data[0]			LPACKED;
+} inline_desc_t;
+
+typedef struct
+{
+  int32 key			PACKED;
+  DescType type			PACKED;
+  uint32 size			PACKED;
+  char data[0]			LPACKED;
+} inline_key_desc_t;
+
+typedef struct list_header
+{
+  /* #### always zero (?) */
+  uint32 unknown_1		PACKED;
+  
+  /* #### contains an applzone address */
+  uint32 unknown_2		PACKED;
+  
+  uint32 param_offset		PACKED;
+  
+  /* contains a tick that identifies the object, either `list' or
+     `reco'; for an apple event, this fiend contains the offset to the
+     parameter section */
+  uint32 attribute_count	PACKED;
+  
+  uint32 param_count		PACKED;
+  
+  /* ### always zero (?) */
+  int32 unknown_3		PACKED;
+  
+   /* offset: 0x18 */
+  char data[0]			LPACKED;
+} list_header_t;
+
+typedef struct { list_header_t *p PACKED_P; } hidden_list_header_ptr;
+typedef hidden_list_header_ptr *list_header_h;
+
+#define PARAM_OFFSET_X(aggr_desc_h)					\
+  (HxX ((list_header_h) aggr_desc_h, param_offset))
+#define PARAM_COUNT_X(aggr_desc_h)					\
+  (HxX ((list_header_h) aggr_desc_h, param_count))
+#define ATTRIBUTE_COUNT_X(aggr_desc_h)					\
+  (HxX ((list_header_h) aggr_desc_h, attribute_count))
+
+#define PARAM_COUNT(aggr_desc_h)	(CL (PARAM_COUNT_X (aggr_desc_h)))
+#define PARAM_OFFSET(aggr_desc_h)	(CL (PARAM_OFFSET_X (aggr_desc_h)))
+#define ATTRIBUTE_COUNT(aggr_desc_h)	(CL (ATTRIBUTE_COUNT_X (aggr_desc_h)))
+
+typedef struct ae_header
+{
+  /* #### always zero (?) */
+  uint32 unknown_1		PACKED;
+  
+  /* #### contains unknown values */
+  uint32 unknown_2		PACKED;
+  
+  uint32 param_offset		PACKED;
+  
+  uint32 attribute_count	PACKED;
+  uint32 param_count		PACKED;
+  
+  /* #### zero pad, use unknown */
+  char pad_1[26]		LPACKED;
+  
+  AEEventClass event_class	PACKED;
+  AEEventID event_id		PACKED;
+  
+  /* #### takes on various values, no idea */
+  uint32 unknown_3		PACKED;
+  
+  /* beginning of target inline descriptor; `target->size' determines
+     target's actual size */
+  inline_desc_t target		LPACKED;
+  
+#if 0
+  /* for show */
+  /* #### contains `aevt' tick */
+  uint32 unknown_4;
+  
+  /* contains 0x00010001 */
+  uint32 unknown_5;
+  
+  char attribute_data[...];
+  
+  /* marker containing tick `;;;;' */
+  uint32 unknown_6;
+  
+  char param_data[...];
+#endif
+} ae_header_t;
+
+typedef struct subdesc_info
+{
+  int count;
+  int base_offset;
+  uint32 *count_p;
+  boolean_t key_p;
+  int inline_desc_header_size;
+} subdesc_info_t;
+
+#endif /* !defined (__rsys_apple_events_h__) */

src/include/rsys/cfm.h

@@ -114,7 +114,7 @@ typedef struct MemFragment
   uint32 length PACKED;
   BOOLEAN inPlace LPACKED;
 }
-MemFragment; 
+MemFragment;
 
 typedef struct DiskFragment
 {

src/include/rsys/commonevt.h

@@ -11,11 +11,11 @@
 typedef struct {
     enum { commonkeypress,      commonkeyrelease, commonbuttonpress,
 	   commonbuttonrelease, commonexpose,     commonenternotify,
-	   commonleavenotify,   commonmotionnotify  } type	PACKED;
+	   commonleavenotify,   commonmotionnotify  } type;
-    INTEGER button	PACKED;
+  INTEGER button;
-    INTEGER x	PACKED;
+  INTEGER x;
-    INTEGER y	PACKED;
+  INTEGER y;
-    LONGINT state	PACKED;
+  LONGINT state;
 } commonevent;
 
 #define commonshiftmask		(1 << 0)

src/include/rsys/cquick.h

@@ -594,6 +594,12 @@ typedef struct write_back_data
   Rect src_rect, dst_rect;
 } write_back_data_t;
 
+struct pixpat_res
+{
+  PixPat pixpat;
+  PixMap patmap;
+};
+
 void pixmap_free_copy (PixMap *pm);
 void pixmap_copy (const PixMap *src_pm, const Rect *src_rect,
 		  PixMap *return_pm, Rect *return_rect);

src/include/rsys/ctl.h

@@ -105,6 +105,30 @@ typedef popup_data_t *popup_data_ptr;
 typedef struct { popup_data_ptr p PACKED_P; } hidden_popup_data_ptr;
 typedef hidden_popup_data_ptr *popup_data_handle;
 
+typedef struct {
+    Rect _tlimit	LPACKED;
+    Rect _tslop		LPACKED;
+    INTEGER _taxis	PACKED;
+} thumbstr;
+
+typedef struct {
+    Rect _crect		LPACKED;
+    INTEGER _cvalue	PACKED;
+    INTEGER _cvisible	PACKED;
+    INTEGER _cmax	PACKED;
+    INTEGER _cmin	PACKED;
+    INTEGER _cprocid	PACKED;
+    LONGINT _crefcon	PACKED;
+    Byte _ctitle	LPACKED;
+} contrlrestype;
+
+struct lsastr
+{
+  Rect limitRect	LPACKED;
+  Rect slopRect		LPACKED;
+  INTEGER axis		PACKED;
+};
+
 extern BOOLEAN ROMlib_cdef0_is_rectangular;
 
 extern void image_arrow_up_active_init (void);

src/include/rsys/dial.h

@@ -0,0 +1,14 @@
+#if !defined (__rsys_dial_h__)
+#  define __rsys_dial_h__
+
+typedef struct
+{
+  int16 count		PACKED;
+  Handle h		PACKED_P;
+  Rect r		LPACKED;
+  uint8 type		LPACKED;
+  uint8 len		LPACKED;
+  int16 res_id		PACKED;
+} icon_item_template_t;
+
+#endif /* !defined (__rsys_dial_h__) */

src/include/rsys/emustubs.h

@@ -8,6 +8,51 @@
  * $Id: emustubs.h 63 2004-12-24 18:19:43Z ctm $
  */
 
+typedef struct
+{
+  Ptr buffer PACKED;
+  ProcPtr proc PACKED;
+  Ptr data PACKED;
+} adbop_t;
+
+typedef struct comm_toolbox_dispatch_args
+{
+  int16 selector		PACKED;
+  
+  union
+    {
+      struct
+        {
+	  int16 n_items		PACKED;
+	  DialogPtr dp		PACKED_P;
+        } shorten_args		LPACKED;
+      struct
+        {
+	  DITLMethod method	PACKED;
+	  Handle new_items_h	PACKED_P;
+	  DialogPtr dp		PACKED_P;
+        } append_args		LPACKED;
+      struct
+        {
+	  DialogPtr dp		PACKED_P;
+        } count_args;
+      struct
+        {
+	  QElemPtr qp PACKED_P;
+        } crm_args;
+	
+    } args;
+} comm_toolbox_dispatch_args_t;
+
+typedef struct
+{
+  void *startPtr	PACKED_P;
+  void *limitPtr	PACKED_P;
+  short cMoreMasters	PACKED;
+  void *pGrowZone	PACKED_P;
+} initzonehiddenargs_t;
+
+
 extern void ROMlib_GetTrapAddress_helper (uint32 *d0p, uint32 d1, uint32 *a0p);
 extern void ROMlib_reset_bad_trap_addresses (void);
 extern void C_pack8_unknown_selector (void);

src/include/rsys/file.h

@@ -104,6 +104,18 @@ typedef struct {	/* add new elements to the beginning of this struct */
     LONGINT CrDat	PACKED;
 } hiddeninfo;
 
+typedef struct {
+    LONGINT dirid;
+    INTEGER filesystemlen;
+    unsigned char hostnamelen;
+    char hostnameandroot[1];	/* potentially many more */
+} rkey_t;
+
+typedef struct {
+    LONGINT parid;
+    char path[1];	/* potentially many more */
+} rcontent_t;
+
 #define FILLOCK 1	/* dirflags & FILLOCK tell whether file is locked */
 
 #define VOLCHAR ':'

src/include/rsys/filedouble.h

@@ -54,6 +54,18 @@ typedef struct {
 
 typedef ULONGINT Single_attribs;
 
+
+typedef struct defaulthead {
+    Single_header head	LPACKED;
+    Single_descriptor desc[10]	LPACKED;	/* we use 4, 6 for spare */
+} defaulthead_t;
+
+typedef struct defaultentries {
+    Single_attribs attribs	PACKED;
+    Single_dates   dates	LPACKED;
+    Single_finfo   finfo	LPACKED;
+} defaultentries_t;
+
 #define SINGLEMAGIC	0x0051600
 #define DOUBLEMAGIC	0x0051607
 

src/include/rsys/font.h

@@ -11,6 +11,11 @@ typedef struct {
     INTEGER fontresid	PACKED;
 } fatabentry;
 
+typedef struct {
+    unsigned short style;
+    INTEGER table[1];	/* actually more */
+} widentry_t;
+
 typedef WidthTable *WPtr;
 typedef struct { WPtr p PACKED_P; } HIDDEN_WPtr;
 typedef HIDDEN_WPtr *WHandle;

src/include/rsys/icon.h

@@ -0,0 +1,18 @@
+#if !defined (__rsys_icon_h__)
+#define __rsys_icon_h__
+
+#define N_SUITE_ICONS 6
+
+/* NOTE:  Cotton didn't really use a struct and I'm not about to munch his
+   code, especially since we don't know the real layout and this is subject
+   to change.  I just wanted to paste in the flags field so we can drop a
+   label in there. */
+
+typedef struct
+{
+  Handle icons[N_SUITE_ICONS];
+  INTEGER label;
+}
+cotton_suite_layout_t;
+
+#endif /* !defined (__rsys_icon_h__) */

src/include/rsys/launch.h

@@ -23,6 +23,12 @@ typedef enum
 }
 launch_failure_t;
 
+typedef struct {
+    unsigned char c[4]		LPACKED;
+    short loc			PACKED;
+    unsigned char shortname[1]	LPACKED;
+} vers_t;
+
 extern launch_failure_t ROMlib_launch_failure;
 extern INTEGER ROMlib_exevrefnum;
 

src/include/rsys/menu.h

@@ -251,6 +251,35 @@ typedef struct icon_info
   int width, height;
 } icon_info_t;
 
+
+typedef struct mct_res
+{
+  int16 n_entries;
+  MCEntry entries[1];
+} mct_res_t;
+
+typedef struct {
+    INTEGER nmen;
+    INTEGER mrid[1];
+} mbartype;
+
+typedef struct {
+    muelem *startp;
+    muelem *endp;
+} startendpairs[2];
+
+typedef struct
+{
+  int32 lasttick	PACKED;
+  int16 count	PACKED;
+  struct tableentry
+  {
+    int16 top	PACKED;
+    StringPtr name	PACKED;
+    mextp options	PACKED;
+  } entry[1];
+} table, *tablePtr, **tableHandle;
+
 extern int ROMlib_sticky_menus_p;
 extern int ROMlib_AppleChar;
 

src/include/rsys/mman_private.h

@@ -193,6 +193,14 @@ typedef struct
 }
 zone_info_t;
 
+
+typedef struct {
+  Zone *sp	PACKED_P;
+  Ptr lp	PACKED_P;
+  INTEGER mm	PACKED;
+  ProcPtr gz	PACKED_P;
+} pblock_t;
+
 extern void ROMlib_sledgehammer_zone (THz zone, boolean_t print_p,
 				      const char *fn, const char *file,
 				      int lineno, const char *where,

src/include/rsys/mmanstubs.h

@@ -10,9 +10,11 @@
 /* Stubs for calling of register based traps to the memory manager */
 
 #if !defined(BINCOMPAT) || defined(SYN68K)
-	Only valid for bincompat.
+# error "Only valid for bincompat, on real 680x0 (not Syn68k)"
 #endif
 
+#include <rsys/mman_private.h>
+
 extern OSErr MemErr;
 
 #include "rsys/trapdefines.h"
@@ -52,12 +54,7 @@ static inline void
 InitZone(ProcPtr pGrowZone, INTEGER cMoreMasters, Ptr limitPtr,
 	 Zone *startPtr)
 {
-  struct {
+  pblock_t pblock;
-    Zone *sp	PACKED_P;
-    Ptr lp	PACKED_P;
-    INTEGER mm	PACKED;
-    ProcPtr gz	PACKED_P;
-  } pblock;
 
   pblock.sp = startPtr;
   pblock.lp = limitPtr;

src/include/rsys/process.h

@@ -0,0 +1,11 @@
+#if !defined (__rsys_process_h__)
+#  define __rsys_process_h__
+
+typedef struct size_resource
+{
+  int16 flags		PACKED;
+  int32 pref_size	PACKED;
+  int32 min_size	PACKED;
+} size_resource_t;
+
+#endif /* !defined (__rsys_process_h__) */

src/include/rsys/quick.h

@@ -14,6 +14,13 @@
    in inline functions below */
 #include "rsys/trapglue.h"
 
+typedef struct ccrsr_res
+{
+  CCrsr crsr 		LPACKED;
+  PixMap crsr_map	LPACKED;
+  char data		LPACKED;
+} ccrsr_res, *ccrsr_res_ptr;
+
 extern boolean_t ROMlib_text_output_disabled_p;
 
 #define SMALLRGN	sizeof(Region)	/* 0x000A */

src/include/rsys/resource.h

@@ -66,6 +66,14 @@ typedef struct {
     Handle rhand	PACKED_P;
 } resref;
 
+typedef struct {            /* empty resource template */
+  reshead bhead	LPACKED;
+  rsrvrec bfill	LPACKED;
+  resmap bmap	LPACKED;
+  INTEGER negone	PACKED;
+} empty_resource_template_t;
+
+
 #if !defined (__STDC__)
 extern resmaphand ROMlib_rntohandl();
 extern Handle ROMlib_mgetres();
@@ -201,5 +209,10 @@ typedef struct
 }
 dcomp_info_t;
 						   
+typedef struct {
+    LONGINT diskoff;
+    resref *rrptr;
+} res_sorttype_t;
+
 #define __MYRESOURCE__
 #endif /* __MYRESOURCE__ */

src/include/rsys/safe_alloca.h

@@ -1,8 +1,6 @@
 #if !defined(__safe_alloca__)
 #define __safe_alloca__
 
-#include "rsys/assert.h"
-
 #if !defined(NDEBUG)
 
 #define FIREWALL_START	0x940504FE

src/include/rsys/screen-dump.h

@@ -0,0 +1,26 @@
+#if !defined (__rsys_screen_dump_h__)
+#  define __rsys_screen_dump_h__
+
+struct header
+{
+  int16 byte_order	__attribute__ ((packed));
+  int16 magic_number	__attribute__ ((packed));
+  int32 ifd_offset	__attribute__ ((packed));
+};
+
+struct directory_entry
+{
+  int16 tag		__attribute__ ((packed));
+  int16 type		__attribute__ ((packed));
+  int32 count		__attribute__ ((packed));
+  int32 value_offset	__attribute__ ((packed));
+};
+
+struct ifd
+{
+  int16 count				__attribute__ ((packed));
+  /* gcc 4.3.0 warns if we leave the following packed attribute in */
+  struct directory_entry entries[1]	/* __attribute__ ((packed)) */;
+};
+
+#endif /* !defined (__rsys_screen_dump_h__) */

src/include/rsys/screen.h

@@ -1 +0,0 @@
-/* This file is obsolete and should be axed. */

src/include/rsys/segment.h

@@ -3,7 +3,18 @@
 
 extern char ROMlib_exit;
 
+
 #if !defined (USE_WINDOWS_NOT_MAC_TYPEDEFS_AND_DEFINES)
+
+#include <SegmentLdr.h>
+
+typedef struct {
+    INTEGER message;
+    INTEGER count;
+    AppFile files[1];
+} finderinfo;
+
+
 extern int ROMlib_print;
 extern void flushcache( void );
 extern void SFSaveDisk_Update (INTEGER vrefnum, Str255 filename);

src/include/rsys/serial.h

@@ -8,6 +8,11 @@
  * $Id: serial.h 63 2004-12-24 18:19:43Z ctm $
  */
 
+typedef struct {
+  Ptr p;
+  INTEGER i;
+} sersetbuf_t;
+
 extern OSErr ROMlib_serialopen (ParmBlkPtr pbp, DCtlPtr dcp);
 extern OSErr ROMlib_serialprime (ParmBlkPtr pbp, DCtlPtr dcp);
 extern OSErr ROMlib_serialctl (ParmBlkPtr pbp, DCtlPtr dcp);

src/include/rsys/syserr.h

@@ -0,0 +1,106 @@
+#if !defined (__rsys_syserr_h__)
+#  define __rsys_syserr_h__
+
+typedef struct {
+    INTEGER	count	PACKED;
+
+    INTEGER	id1	PACKED,
+		len1	PACKED,
+		prim1	PACKED,
+		sec1	PACKED,
+		icon1	PACKED,
+		proc1	PACKED,
+		but1	PACKED;
+
+    INTEGER	id2	PACKED,
+    		len2	PACKED;
+    Point	point2	LPACKED;
+    unsigned char str2[52]	LPACKED;
+
+    INTEGER	id3	PACKED,
+		len3	PACKED;
+
+    Rect	rect3	LPACKED;
+    char	icon3[32][4]	LPACKED;
+
+    INTEGER	id4	PACKED,
+		len4	PACKED;
+
+    Point	point4	LPACKED;
+    char	str4[46]	LPACKED;
+
+    INTEGER	id5	PACKED,
+   	        len5	PACKED,
+		num5	PACKED,
+		str5	PACKED;
+    Rect	rect5	LPACKED;
+    INTEGER	proc5	PACKED,
+    		str5b	PACKED;
+    Rect	rect5b	LPACKED;
+    INTEGER	proc5b	PACKED;
+
+    INTEGER	id6	PACKED,
+		len6	PACKED;
+
+    char	str6[4]	LPACKED;
+
+    INTEGER	id7	PACKED,
+		len7	PACKED;
+    char	str7[6]	LPACKED;
+
+    INTEGER	id8	PACKED,
+		len8	PACKED;
+    void	(*func8)(void)	PACKED;
+
+} myalerttab_t;
+
+
+struct adef {
+    INTEGER id			PACKED,
+	    alen		PACKED,
+	    primetextid		PACKED,
+	    secondtextid	PACKED,
+	    iconid		PACKED,
+	    procid		PACKED,
+	    buttonid		PACKED;
+};
+
+struct tdef {
+    INTEGER id			PACKED,
+	    alen		PACKED;
+    Point loc			LPACKED;
+    char text[1]		LPACKED;	/* at least one NUL byte */
+};
+
+struct idef {
+    INTEGER id		PACKED,
+	    alen	PACKED;
+    Rect loc		LPACKED;
+    LONGINT ike[32]	PACKED;
+};
+
+struct pdef {
+    INTEGER id		PACKED,
+	    alen	PACKED;
+    void (*proc)()	PACKED;
+			/* NOTE:  THIS IS NOT THE WAY IT WORKS IN THE M*C */
+};
+
+struct bdef {
+    INTEGER id			PACKED,
+	    alen		PACKED,
+	    nbut		PACKED;
+    struct but {
+	INTEGER butstrid	PACKED;
+	Rect butloc		LPACKED;
+	INTEGER butprocid	PACKED;
+    } buts[1]			LPACKED;
+};
+
+struct sdef {
+    INTEGER id		PACKED,
+	    alen	PACKED;
+    char text[1]	LPACKED;
+};
+
+#endif /* !defined (__rsys_syserr_h__) */

src/include/rsys/toolevent.h

@@ -8,6 +8,13 @@
  * $Id: toolevent.h 63 2004-12-24 18:19:43Z ctm $
  */
 
+typedef struct {
+    INTEGER version;
+    INTEGER tableno[256];
+    INTEGER ntables;
+    Byte table[1][128];	/* who knows how many */
+} keymap;
+
 extern void dofloppymount (void);
 extern BOOLEAN ROMlib_beepedonce;
 extern int ROMlib_right_button_modifier;

src/include/rsys/wind.h

@@ -18,6 +18,17 @@
 #include "rsys/smash.h"
 #include "rsys/pstuff.h"
 
+typedef struct {
+    Rect _wrect		LPACKED;
+    INTEGER _wprocid	PACKED;
+    char _wvisible	LPACKED;
+    char _padding1	LPACKED;
+    char _wgoaway	LPACKED;
+    char _padding2	LPACKED;
+    LONGINT _wrefcon	PACKED;
+    Byte _wtitle	LPACKED;
+} windrestype;
+
 extern LONGINT C_wdef0 (INTEGER, WindowPtr, INTEGER, LONGINT),
 	       C_wdef16(INTEGER, WindowPtr, INTEGER, LONGINT);
 

src/iu.c

@@ -17,7 +17,6 @@ char ROMlib_rcsid_iu[] =
 #include "BinaryDecimal.h"
 #include "rsys/glue.h"
 #include "rsys/resource.h"
-#include "rsys/assert.h"
 #include "rsys/hook.h"
 #include <ctype.h>
 

src/keycode.c

@@ -55,7 +55,6 @@ char ROMlib_rcsid_keycode[] = "$Id: keycode.c 63 2004-12-24 18:19:43Z ctm $";
 
 #include "rsys/soundopts.h"
 #include "rsys/blockinterrupts.h"
-#include "rsys/screen.h"
 #include "rsys/prefs.h"
 #include <sys/types.h>
 #include "rsys/version.h"

src/launch.c

@@ -27,7 +27,6 @@ char ROMlib_rcsid_launch[] =
 #include "SoundDvr.h"
 #include "TextEdit.h"
 #include "SysErr.h"
-#include "SysError.h"
 #include "MenuMgr.h"
 #include "ScriptMgr.h"
 #include "DeskMgr.h"
@@ -372,11 +371,6 @@ size_info_t size_info;
 
 #define VERSFMT		"(0x%02x, 0x%02x, 0x%02x, 0x%02x, %d)"
 #define VERSSIZE(vp)	(sizeof(VERSFMT) + (vp)->shortname[0] + 6)
-typedef struct {
-    unsigned char c[4]		LPACKED;
-    short loc			PACKED;
-    unsigned char shortname[1]	LPACKED;
-} vers_t;
 
 LONGINT ROMlib_creator;
 

src/listAccess.c

@@ -13,7 +13,6 @@ char ROMlib_rcsid_listAccess[] =
 #include "ListMgr.h"
 #include "MemoryMgr.h"
 #include "IntlUtil.h"
-#include "rsys/screen.h"
 #include "rsys/list.h"
 #include "rsys/hook.h"
 

src/listAddDel.c

@@ -13,7 +13,6 @@ char ROMlib_rcsid_listAddDel[] =
 #include "ListMgr.h"
 #include "MemoryMgr.h"
 #include "rsys/list.h"
-#include "rsys/screen.h"
 
 P3(PUBLIC pascal trap, INTEGER, LAddColumn, INTEGER, count,	/* IMIV-271 */
 					      INTEGER, coln, ListHandle, list)

src/listCreate.c

@@ -14,7 +14,6 @@ char ROMlib_rcsid_listCreate[] =
 #include "ResourceMgr.h"
 #include "ListMgr.h"
 #include "rsys/list.h"
-#include "rsys/screen.h"
 
 #define STEF_lActivefix
 

src/listDisplay.c

@@ -14,7 +14,6 @@ char ROMlib_rcsid_listDisplay[] =
 
 #include "rsys/cquick.h"
 #include "rsys/list.h"
-#include "rsys/screen.h"
 #include "rsys/hook.h"
 
 P2(PUBLIC pascal trap, void, LDraw, Cell, cell,			/* IMIV-275 */

src/listMouse.c

@@ -19,7 +19,6 @@ char ROMlib_rcsid_listMouse[] =
 
 #include "rsys/cquick.h"
 #include "rsys/list.h"
-#include "rsys/screen.h"
 #include "rsys/pstuff.h"
 #include "rsys/hook.h"
 

src/listStdLDEF.c

@@ -10,7 +10,6 @@ char ROMlib_rcsid_listStdLDEF[] =
 #include "rsys/common.h"
 #include "ListMgr.h"
 #include "MemoryMgr.h"
-#include "rsys/screen.h"
 
 A5(PRIVATE, void, draw, BOOLEAN, sel, Rect *, rect, INTEGER, doff,
 						INTEGER, dl, ListHandle, list)

src/menu.c

@@ -31,7 +31,6 @@ char ROMlib_rcsid_menu[] =
 #include "rsys/menu.h"
 #include "rsys/cquick.h"
 #include "rsys/quick.h"
-#include "rsys/screen.h"
 #include "rsys/glue.h"
 #include "rsys/mman.h"
 #include "rsys/smash.h"
@@ -221,12 +220,6 @@ P1(PUBLIC pascal trap, void, CalcMenuSize, MenuHandle, mh)
  *	 from a resource id to a handle.
  */
 
-typedef struct mct_res
-{
-  int16 n_entries;
-  MCEntry entries[1];
-} mct_res_t;
-
 P1 (PUBLIC pascal trap, MenuHandle, GetMenu, int16, rid)
 {
   MenuHandle retval;
@@ -735,11 +728,6 @@ P1 (PUBLIC pascal trap, void, DeleteMenu, int16, mid)
   HIEROFFX = CW (HIEROFF - sizeof (muelem));
 }
 
-typedef struct {
-    INTEGER nmen;
-    INTEGER mrid[1];
-} mbartype;
-
 typedef mbartype *mbarptr;
 typedef struct { mbarptr p PACKED_P; } HIDDEN_mbarptr;
 typedef HIDDEN_mbarptr *mbarhandle;
@@ -803,11 +791,6 @@ P1(PUBLIC pascal trap, void, SetMenuBar, Handle, ml)
     MenuList = RM(temph.p);
 }
 
-typedef struct {
-    muelem *startp;
-    muelem *endp;
-} startendpairs[2];
-
 enum { nonhier = 0, hier = 1 };
 
 A1(PRIVATE, void, initpairs, startendpairs, pairs)

src/menuColor.c

@@ -15,7 +15,6 @@ char ROMlib_rcsid_menuColor[] =
 
 #include "rsys/menu.h"
 #include "rsys/cquick.h"
-#include "rsys/assert.h"
 
 void
 menu_bar_color (RGBColor *bar_color)

src/mmansubr.c

@@ -17,8 +17,6 @@ char ROMlib_rcsid_mmansubr[] =
 #include "ResourceMgr.h"
 
 #include "rsys/mman_private.h"
-#include "rsys/assert.h"
-#include "rsys/fatal.h"
 #include "rsys/hook.h"
 #include "rsys/system_error.h"
 #include "rsys/vdriver.h"

src/parse.y

@@ -1,8 +1,6 @@
 %{
 #include "rsys/common.h"
 #include "rsys/options.h"
-#include "rsys/debug.h"
-#include "rsys/myabort.h"
 #include "rsys/prefs.h"
 #include "rsys/crc.h"
 #include "rsys/parse.h"

src/prLowLevel.c

@@ -22,7 +22,6 @@ char ROMlib_rcsid_prLowLevel[] =
 #include "rsys/pstuff.h"
 #include "rsys/print.h"
 #include "rsys/hook.h"
-#include "rsys/debug.h"
 #include "rsys/ctl.h"
 #include "rsys/ini.h"
 #include "rsys/notmac.h"

src/process.c

@@ -15,7 +15,7 @@ char ROMlib_rcsid_process[] =
 #include "ToolboxEvent.h"
 
 #include "rsys/mman.h"
-#include "rsys/fatal.h"
+#include "rsys/process.h"
 
 #define declare_handle_type(type_prefix)				\
   typedef type_prefix ## _t *type_prefix ## _ptr;			\
@@ -25,13 +25,6 @@ char ROMlib_rcsid_process[] =
     } hidden_ ## type_prefix ## _ptr;					\
   typedef hidden_ ## type_prefix ## _ptr *type_prefix ## _handle
 
-typedef struct size_resource
-{
-  int16 flags		PACKED;
-  int32 pref_size	PACKED;
-  int32 min_size	PACKED;
-} size_resource_t;
-
 declare_handle_type (size_resource);
 
 #define SIZE_FLAGS_X(size)	(HxX (size, flags))

src/qBit.c

@@ -19,7 +19,6 @@ char ROMlib_rcsid_qBit[] =
 #include "rsys/cquick.h"
 #include "rsys/stdbits.h"
 #include "rsys/picture.h"
-#include "rsys/screen.h"
 #include "rsys/mman.h"
 
 P6 (PUBLIC pascal trap, void, CopyBits,

src/qCConv.c

@@ -10,10 +10,6 @@ char ROMlib_rcsid_qCConv[] =
 #include "rsys/common.h"
 #include "QuickDraw.h"
 
-#include "rsys/fatal.h"
-#include "rsys/myabort.h"
-#include "rsys/assert.h"
-
 /* cmy and rgb color spaces are simply complements */
 
 P2 (PUBLIC pascal trap, void, CMY2RGB,

src/qCGrafPort.c

@@ -18,9 +18,6 @@ char ROMlib_rcsid_qCGrafport[] =
 #include "rsys/cquick.h"
 #include "rsys/mman.h"
 
-#include "rsys/myabort.h"
-#include "rsys/assert.h"
-
 #include "rsys/xdata.h"
 #include "rsys/evil.h"
 
@@ -417,12 +414,6 @@ P0 (PUBLIC pascal trap, PixPatHandle, NewPixPat)
   return pixpat;
 }
 
-struct pixpat_res
-{
-  PixPat pixpat;
-  PixMap patmap;
-};
-
 typedef struct pixpat_res *pixpat_res_ptr;
 typedef struct { pixpat_res_ptr p PACKED_P; } HIDDEN_pixpat_res_ptr;
 typedef HIDDEN_pixpat_res_ptr *pixpat_res_handle;

src/qCursor.c

@@ -24,9 +24,10 @@ char ROMlib_rcsid_qCursor[] =
 #include "rsys/resource.h"
 #include "rsys/host.h"
 
-#include "rsys/fatal.h"
 #include "rsys/osevent.h"
 
+#include "rsys/quick.h"
+
 #if !defined (CURSOR_DEBUG)
 
 #define HOST_SET_CURSOR(d,m,x,y) host_set_cursor (d,m,x,y)
@@ -218,13 +219,6 @@ P2(PUBLIC pascal trap, void, ShieldCursor, Rect *, rp, Point, p) /* IMI-474 */
 	wewantpointermovements(-1);
 }
 
-typedef struct ccrsr_res
-{
-  CCrsr crsr 		LPACKED;
-  PixMap crsr_map	LPACKED;
-  char data		LPACKED;
-} ccrsr_res, *ccrsr_res_ptr;
-
 typedef struct { ccrsr_res_ptr p PACKED_P; } HIDDEN_ccrsr_res_ptr;
 typedef HIDDEN_ccrsr_res_ptr *ccrsr_res_handle;
 

src/qIMIV.c

@@ -16,7 +16,6 @@ char ROMlib_rcsid_qIMIV[] =
 #include "rsys/quick.h"
 #include "rsys/cquick.h"
 #include "rsys/stdbits.h"
-#include "rsys/screen.h"
 #include "rsys/safe_alloca.h"
 #include "rsys/tempalloc.h"
 #include "rsys/dirtyrect.h"

src/qIMVxfer.c

@@ -13,9 +13,6 @@ char ROMlib_rcsid_qIMVxfer[] =
 #include "CQuickDraw.h"
 #include "rsys/cquick.h"
 
-#include "rsys/fatal.h"
-
-
 /* Helper function: creates a new, sorted table so the value is the
  * same as the index (although we don't bother filling in most of the
  * color table fields).

src/qPicstuff.c

@@ -22,7 +22,6 @@ char ROMlib_rcsid_qPicstuff[] =
 #include "rsys/toolutil.h"
 #include "rsys/cquick.h"
 #include "rsys/picture.h"
-#include "rsys/screen.h"
 #include "rsys/mman.h"
 #include "rsys/xdata.h"
 #include "rsys/tempalloc.h"

src/qScale.c

@@ -12,7 +12,6 @@ char ROMlib_rcsid_qScale[] =
 #include "CQuickDraw.h"
 
 #include "rsys/cquick.h"
-#include "rsys/fatal.h"
 
 /* This routine scales old_bitmap and stores the result in dst_bitmap.
  * The only field of dst_bitmap that needs to be valid on entry is

src/qStdPoly.c

@@ -18,7 +18,6 @@ char ROMlib_rcsid_qStdPoly[] =
 
 #include "rsys/cquick.h"
 #include "rsys/picture.h"
-#include "rsys/screen.h"
 
 A2(PRIVATE, void, polyrgn, PolyHandle, ph, RgnHandle, rh)
 {

src/qStdRgn.c

@@ -24,9 +24,6 @@ char ROMlib_rcsid_qStdRgn[] =
 #include "rsys/flags.h"
 #include "rsys/host.h"
 #include "rsys/vdriver.h"
-#include "rsys/fatal.h"
-#include "rsys/assert.h"
-#include "rsys/myabort.h"
 #include "rsys/tempalloc.h"
 
 #include "rsys/xdblt.h"

src/resMod.c

@@ -18,7 +18,6 @@ char ROMlib_rcsid_resMod[] =
 #include "rsys/glue.h"
 #include "rsys/mman.h"
 #include "rsys/file.h"
-#include "rsys/assert.h"
 
 P3(PUBLIC pascal trap, void, SetResInfo, Handle, res, INTEGER, id,
 							       StringPtr, name)
@@ -329,18 +328,13 @@ A2(PUBLIC, void, ROMlib_wr, resmaphand, map, resref *, rr)	/* INTERNAL */
 	ROMlib_setreserr(noErr);
 }
 
-typedef struct {
+typedef res_sorttype_t *sorttypeptr;
-    LONGINT diskoff;
-    resref *rrptr;
-} sorttype;
-
-typedef sorttype *sorttypeptr;
 typedef struct { sorttypeptr p PACKED_P; } HIDDEN_sorttypeptr;
 typedef HIDDEN_sorttypeptr *sorttypehand;
 
 A3(PRIVATE, void, fillst, sorttypehand, st, resref *, rp, resref *, rep)
 {
-    sorttype *end = STARH(st), *sp;
+    res_sorttype_t *end = STARH(st), *sp;
     LONGINT newoff;
     
     end++->diskoff = -1;    /* real disk offsets are always > 0 */
@@ -352,7 +346,7 @@ A3(PRIVATE, void, fillst, sorttypehand, st, resref *, rp, resref *, rep)
         for (sp = end-1; newoff < sp->diskoff; sp--)
             ;
         sp++;
-        BlockMove((Ptr) sp, (Ptr) (sp+1), (Size)(end - sp) * sizeof(sorttype));
+        BlockMove((Ptr) sp, (Ptr) (sp+1), (Size)(end - sp) * sizeof(res_sorttype_t));
         sp->diskoff = newoff;
         sp->rrptr = rp;
         end++;
@@ -401,7 +395,7 @@ A4(PRIVATE, void, putdat, INTEGER, fn, LONGINT, datoff, LONGINT *, doffp,
     *doffp += sizeof(LONGINT) + size;
 }
 
-A4(PRIVATE, LONGINT, walkst, sorttype *, sp, sorttype *, sep, INTEGER, fn,
+A4(PRIVATE, LONGINT, walkst, res_sorttype_t *, sp, res_sorttype_t *, sep, INTEGER, fn,
 							    LONGINT, datoff)
 {
     LONGINT size;
@@ -462,7 +456,7 @@ A1(PRIVATE, void, compactdata, resmaphand, map)
     resoff = TYPEOFF(map) + sizeof(INTEGER) +
                                 (NUMTMINUS1(map) + 1) * sizeof(typref);
     nres = (NAMEOFF(map) - resoff) / sizeof(resref);
-    st = (sorttypehand) NewHandle((Size)sizeof(sorttype) * (nres + 1));
+    st = (sorttypehand) NewHandle((Size)sizeof(res_sorttype_t) * (nres + 1));
     mapstate = HGetState((Handle) map);
     HLock((Handle) map);
     rr = (resref *)((char *) STARH(map) + resoff);

src/resOpen.c

@@ -28,12 +28,7 @@ HCreateResFile_helper (INTEGER vrefnum, LONGINT parid, Str255 name,
 {
     INTEGER f;
     LONGINT leof, lc;
-    struct {            /* empty resource template */
+    empty_resource_template_t buf;
-        reshead bhead	LPACKED;
-        rsrvrec bfill	LPACKED;
-        resmap bmap	LPACKED;
-        INTEGER negone	PACKED;
-    } buf;
 
     ROMlib_setreserr(HCreate(vrefnum, parid, name, creator, type)); /* ????
 								       might

src/screen-dump.c

@@ -24,6 +24,7 @@ char ROMlib_rcsid_screendump[] =
 #include "rsys/uniquefile.h"
 #include "rsys/notmac.h"
 #include "rsys/vdriver.h"
+#include "rsys/screen-dump.h"
 
 #define II_little_endian 0x4949
 #define MM_big_endian 0x4D4D
@@ -57,28 +58,6 @@ char ROMlib_rcsid_screendump[] =
 #define ResolutionUnit 296
 #define ColorMap 320
 
-struct header
-{
-  int16 byte_order	__attribute__ ((packed));
-  int16 magic_number	__attribute__ ((packed));
-  int32 ifd_offset	__attribute__ ((packed));
-};
-
-struct directory_entry
-{
-  int16 tag		__attribute__ ((packed));
-  int16 type		__attribute__ ((packed));
-  int32 count		__attribute__ ((packed));
-  int32 value_offset	__attribute__ ((packed));
-};
-
-struct ifd
-{
-  int16 count				__attribute__ ((packed));
-  /* gcc 4.3.0 warns if we leave the following packed attribute in */
-  struct directory_entry entries[1]	/* __attribute__ ((packed)) */;
-};
-
 static void
 ifd_add_entry (struct ifd *ifd, int tag, int type, ...)
 {

src/segment.c

@@ -63,12 +63,6 @@ char ROMlib_rcsid_segment[] =
 #include "vga.h"
 #endif /* defined(MSDOS) */
 
-typedef struct {
-    INTEGER message;
-    INTEGER count;
-    AppFile files[1];
-} finderinfo;
-
 typedef finderinfo *finderinfoptr;
 typedef struct { finderinfoptr p PACKED_P; } HIDDEN_finderinfoptr;
 typedef HIDDEN_finderinfoptr *finderinfohand;

src/serial.c

@@ -28,6 +28,7 @@ char ROMlib_rcsid_serial[] =
 
 #include "rsys/file.h"
 #include "rsys/hfs.h"
+#include "rsys/serial.h"
 
 #if defined (MSDOS)
 #include "dosserial.h"
@@ -125,10 +126,7 @@ A2(PUBLIC, OSErr, SerReset, INTEGER, rn, INTEGER, config)	/* IMII-250 */
 
 A3(PUBLIC, OSErr, SerSetBuf, INTEGER, rn, Ptr, p, INTEGER, len)	/* IMII-251 */
 {
-    struct {
+    sersetbuf_t temp;
-	Ptr p;
-	INTEGER i;
-    } temp;
 
     temp.p = RM (p);
     temp.i = CW (len);

src/stdfile.c

@@ -47,7 +47,6 @@ char ROMlib_rcsid_stdfile[] =
 #include "rsys/file.h"
 #include "rsys/stdfile.h"
 #include "rsys/arrowkeys.h"
-#include "rsys/screen.h"
 #include "rsys/glue.h"
 #include "rsys/resource.h"
 #include "rsys/pstuff.h"

src/stdmdef.c

@@ -22,7 +22,6 @@ char ROMlib_rcsid_stdmdef[] =
 #include "rsys/wind.h"
 #include "rsys/host.h"
 
-#include "rsys/fatal.h"
 #include "rsys/custom.h"
 
 static Rect *current_menu_rect;
@@ -42,18 +41,6 @@ typedef enum
   uparrow, downarrow,
 } arrowtype;
 
-typedef struct
-{
-  int32 lasttick	PACKED;
-  int16 count	PACKED;
-  struct tableentry
-  {
-    int16 top	PACKED;
-    StringPtr name	PACKED;
-    mextp options	PACKED;
-  } entry[1];
-} table, *tablePtr, **tableHandle;
-
 /*
  * I think SICNFLAG is correct.  I'm guessing from what I've seen in MacMan
  * and some sort of dollhouse construction set.  MacMan doesn't have any icon

src/syserr.c

@@ -23,7 +23,6 @@ char ROMlib_rcsid_syserr[] =
 
 #include "rsys/cquick.h"
 #include "rsys/quick.h"
-#include "rsys/screen.h"
 #include "rsys/next.h"
 #include "rsys/segment.h"
 #include "rsys/flags.h"
@@ -32,59 +31,9 @@ char ROMlib_rcsid_syserr[] =
 #include "rsys/next.h"
 #include "rsys/osevent.h"
 #include "rsys/options.h"
+#include "rsys/syserr.h"
 
-PRIVATE struct {
+PRIVATE myalerttab_t myalerttab = {
-    INTEGER	count	PACKED;
-
-    INTEGER	id1	PACKED,
-		len1	PACKED,
-		prim1	PACKED,
-		sec1	PACKED,
-		icon1	PACKED,
-		proc1	PACKED,
-		but1	PACKED;
-
-    INTEGER	id2	PACKED,
-    		len2	PACKED;
-    Point	point2	LPACKED;
-    unsigned char str2[52]	LPACKED;
-
-    INTEGER	id3	PACKED,
-		len3	PACKED;
-
-    Rect	rect3	LPACKED;
-    char	icon3[32][4]	LPACKED;
-
-    INTEGER	id4	PACKED,
-		len4	PACKED;
-
-    Point	point4	LPACKED;
-    char	str4[46]	LPACKED;
-
-    INTEGER	id5	PACKED,
-   	        len5	PACKED,
-		num5	PACKED,
-		str5	PACKED;
-    Rect	rect5	LPACKED;
-    INTEGER	proc5	PACKED,
-    		str5b	PACKED;
-    Rect	rect5b	LPACKED;
-    INTEGER	proc5b	PACKED;
-
-    INTEGER	id6	PACKED,
-		len6	PACKED;
-
-    char	str6[4]	LPACKED;
-
-    INTEGER	id7	PACKED,
-		len7	PACKED;
-    char	str7[6]	LPACKED;
-
-    INTEGER	id8	PACKED,
-		len8	PACKED;
-    void	(*func8)(void)	PACKED;
-
-} myalerttab = {
     CWC(8),
 
 #define WELCOME_CODE	0x28
@@ -162,54 +111,6 @@ PRIVATE struct {
 
 char syserr_msg[256];
 
-struct adef {
-    INTEGER id			PACKED,
-	    alen		PACKED,
-	    primetextid		PACKED,
-	    secondtextid	PACKED,
-	    iconid		PACKED,
-	    procid		PACKED,
-	    buttonid		PACKED;
-};
-
-struct tdef {
-    INTEGER id			PACKED,
-	    alen		PACKED;
-    Point loc			LPACKED;
-    char text[1]		LPACKED;	/* at least one NUL byte */
-};
-
-struct idef {
-    INTEGER id		PACKED,
-	    alen	PACKED;
-    Rect loc		LPACKED;
-    LONGINT ike[32]	PACKED;
-};
-
-struct pdef {
-    INTEGER id		PACKED,
-	    alen	PACKED;
-    void (*proc)()	PACKED;
-			/* NOTE:  THIS IS NOT THE WAY IT WORKS IN THE M*C */
-};
-
-struct bdef {
-    INTEGER id			PACKED,
-	    alen		PACKED,
-	    nbut		PACKED;
-    struct but {
-	INTEGER butstrid	PACKED;
-	Rect butloc		LPACKED;
-	INTEGER butprocid	PACKED;
-    } buts[1]			LPACKED;
-};
-
-struct sdef {
-    INTEGER id		PACKED,
-	    alen	PACKED;
-    char text[1]	LPACKED;
-};
-
 A1(PRIVATE, INTEGER *, findid, INTEGER, id)
 {
     int i;

src/teEdit.c

@@ -22,7 +22,6 @@ char ROMlib_rcsid_teEdit[] =
 #include "rsys/mman.h"
 #include "rsys/tesave.h"
 #include "rsys/arrowkeys.h"
-#include "rsys/screen.h"
 #include "rsys/notmac.h"
 #include "rsys/osevent.h"
 

src/toolevent.c

@@ -157,13 +157,6 @@ A0(PUBLIC, void, ROMlib_alarmoffmbar)
 	ROMlib_togglealarm();
 }
 
-typedef struct {
-    INTEGER version;
-    INTEGER tableno[256];
-    INTEGER ntables;
-    Byte table[1][128];	/* who knows how many */
-} keymap;
-
 P3(PUBLIC pascal trap, LONGINT, KeyTrans, Ptr, mapp, unsigned short, code,
 							      LONGINT *, state)
 {

src/uniquefile.c

@@ -9,7 +9,6 @@ char ROMlib_rcsid_uniquefile[] =
 
 #include "rsys/common.h"
 #include "rsys/uniquefile.h"
-#include "rsys/assert.h"
 #include "rsys/file.h"
 
 

src/unix_like.c

@@ -17,7 +17,6 @@
 #include "rsys/mman.h"
 #include "rsys/system_error.h"
 #include "rsys/memory_layout.h"
-#include "rsys/assert.h"
 #include "rsys/lowglobals.h"
 
 #include "Gestalt.h"

src/windDisplay.c

@@ -17,7 +17,6 @@ char ROMlib_rcsid_windDisplay[] =
 /* get {C}PORT_... accessors */
 #include "rsys/cquick.h"
 #include "rsys/wind.h"
-#include "rsys/screen.h"
 #include "rsys/glue.h"
 
 P2(PUBLIC pascal trap, void, SetWTitle, WindowPtr, w, StringPtr, t)

src/windDocdef.c

@@ -16,8 +16,6 @@ char ROMlib_rcsid_windDocdef[] =
 #include "rsys/cquick.h"
 #include "rsys/wind.h"
 #include "rsys/ctl.h"
-#include "rsys/screen.h"
-#include "rsys/fatal.h"
 
 #include "rsys/image.h"
 

src/windInit.c

@@ -27,7 +27,6 @@ char ROMlib_rcsid_windInit[] =
 
 #include "rsys/cquick.h"
 #include "rsys/wind.h"
-#include "rsys/screen.h"
 #include "rsys/menu.h"
 #include "rsys/resource.h"
 #include "rsys/system_error.h"
@@ -547,17 +546,6 @@ P8 (PUBLIC pascal trap, CWindowPtr, NewCWindow,
   return (CWindowPtr) w;
 }
 
-typedef struct {
-    Rect _wrect		LPACKED;
-    INTEGER _wprocid	PACKED;
-    char _wvisible	LPACKED;
-    char _padding1	LPACKED;
-    char _wgoaway	LPACKED;
-    char _padding2	LPACKED;
-    LONGINT _wrefcon	PACKED;
-    Byte _wtitle	LPACKED;
-} windrestype;
-
 typedef windrestype *windrestypeptr;
 typedef struct { windrestypeptr p PACKED_P; } HIDDEN_windrestypeptr;
 typedef HIDDEN_windrestypeptr *windrestypehand;