diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Cheader LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Cheader
*** LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Cheader     Thu Apr 13 15:30:58 2000
--- LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Cheader Thu May  4 10:08:54 2000
***************
*** 26,31 ****
--- 26,32 ----
  #include <time.h>
  #include <kernel.h>      /* TV 980115 */
  
+ #include "types.h"
  #include "macros.h"
  #include "os.h"
  
***************
*** 85,91 ****
     def_t  t,
     char  *tag,
     char  *v,
!    bool   var,
     int    nest
  )
  {
--- 86,92 ----
     def_t  t,
     char  *tag,
     char  *v,
!    osbool var,
     int    nest
  )
  {
***************
*** 124,130 ****
        break;
  
        case def_TYPE_BOOL:
!          if ((rc = fprintf (file, v == NULL? "bool": "bool %s", v)) < 0)
              goto finish;
        break;
  
--- 125,131 ----
        break;
  
        case def_TYPE_BOOL:
!          if ((rc = fprintf (file, v == NULL? "osbool": "osbool %s", v)) < 0)
              goto finish;
        break;
  
***************
*** 327,333 ****
     lookup_t  consts,
     lookup_t  types,
     lookup_t  swis,
!    bool      c_plus_plus
  )
  {
     os_error *error = NULL;
--- 328,334 ----
     lookup_t  consts,
     lookup_t  types,
     lookup_t  swis,
!    osbool    c_plus_plus
  )
  {
     os_error *error = NULL;
***************
*** 339,345 ****
     void     *context;
     int       i, rc = 0;
     time_t    now;
!    bool      start;
  
     comment = !c_plus_plus? " *": "//";
  
--- 340,346 ----
     void     *context;
     int       i, rc = 0;
     time_t    now;
!    osbool    start;
  
     comment = !c_plus_plus? " *": "//";
  
***************
*** 425,431 ****
     /*Make sure we have "types.h".*/
     if ((rc = fprintf (file,
           "#ifndef types_H\n"
!          "#include \"types.h\"\n" /*no spaces for GCC etc. 30th Jan 1995*/
           "#endif\n\n")) < 0)
        goto finish;
  
--- 426,433 ----
     /*Make sure we have "types.h".*/
     if ((rc = fprintf (file,
           "#ifndef types_H\n"
!          "#include \"OSLibInclude:types.h\"\n" /*no spaces for GCC etc. 30th Jan 1995*/
!                                                 /* OsLibInclude: 4 May 2000 */
           "#endif\n\n")) < 0)
        goto finish;
  
***************
*** 442,448 ****
        def_as_extern (c_name, needs);
        if ((rc = fprintf (file,
              "#ifndef %s_H\n"
!             "#include \"%s.h\"\n" /*no spaces for GCC etc. 30th Jan 1995*/
              "#endif\n\n",
              c_name, c_name)) < 0)
           goto finish;
--- 444,451 ----
        def_as_extern (c_name, needs);
        if ((rc = fprintf (file,
              "#ifndef %s_H\n"
!             "#include \"OSLibInclude:%s.h\"\n" /*no spaces for GCC etc. 30th Jan 1995*/
!                                                 /* OsLibInclude: 4 May 2000 */
              "#endif\n\n",
              c_name, c_name)) < 0)
           goto finish;
***************
*** 677,683 ****
              if (t->description != NULL)
              {
                 /*Start the description part.*/
!                bool first;
  
                 if (!c_plus_plus)
                 {
--- 680,686 ----
              if (t->description != NULL)
              {
                 /*Start the description part.*/
!                osbool first;
  
                 if (!c_plus_plus)
                 {
***************
*** 1080,1086 ****
     context = 0;
     while (TRUE)
     {
!       bool nonx, first;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s, &context))
              != NULL)
--- 1083,1089 ----
     context = 0;
     while (TRUE)
     {
!       osbool nonx, first;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s, &context))
              != NULL)
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Chelp LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Chelp
*** LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Chelp       Wed Feb  2 19:36:50 2000
--- LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Chelp   Wed May  3 17:53:16 2000
***************
*** 42,48 ****
     def_t  t,
     char  *tag,
     char  *v,
!    bool   var,
     int    nest
  )
  {
--- 42,48 ----
     def_t  t,
     char  *tag,
     char  *v,
!    osbool var,
     int    nest
  )
  {
***************
*** 81,87 ****
        break;
  
        case def_TYPE_BOOL:
!          if ((rc = fprintf (file, v == NULL? "bool": "bool %s", v)) < 0)
              goto finish;
        break;
  
--- 81,87 ----
        break;
  
        case def_TYPE_BOOL:
!          if ((rc = fprintf (file, v == NULL? "osbool": "osbool %s", v)) < 0)
              goto finish;
        break;
  
***************
*** 398,404 ****
     context = 0;
     while (TRUE)
     {
!       bool nonx, first;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s, &context)) !=
              NULL)
--- 398,404 ----
     context = 0;
     while (TRUE)
     {
!       osbool nonx, first;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s, &context)) !=
              NULL)
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Cstrong LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Cstrong
*** LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Cstrong     Tue Mar  7 12:36:38 2000
--- LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Cstrong Wed May  3 17:55:02 2000
***************
*** 125,131 ****
     def_t  t,
     char  *tag,
     char  *v,
!    bool   var,
     int    nest
  )
  {
--- 125,131 ----
     def_t  t,
     char  *tag,
     char  *v,
!    osbool var,
     int    nest
  )
  {
***************
*** 164,170 ****
        break;
  
        case def_TYPE_BOOL:
!          if ((rc = fprintf (file, v == NULL? "bool": "bool %s", v)) < 0)
              goto finish;
        break;
  
--- 164,170 ----
        break;
  
        case def_TYPE_BOOL:
!          if ((rc = fprintf (file, v == NULL? "osbool": "osbool %s", v)) < 0)
              goto finish;
        break;
  
***************
*** 457,463 ****
  
           if (t->tag == def_TYPE_STRUCT || t->tag == def_TYPE_UNION)
           {
!             bool first = TRUE;
              int i;
  
              for (i = 0; i < t->data AS list.count; i++)
--- 457,463 ----
  
           if (t->tag == def_TYPE_STRUCT || t->tag == def_TYPE_UNION)
           {
!             osbool first = TRUE;
              int i;
  
              for (i = 0; i < t->data AS list.count; i++)
***************
*** 478,484 ****
           /*Additionally supply a list of constants with values of that
              type.*/
           void *context;
!          bool first = TRUE;
  
           context = NULL;
           while (TRUE)
--- 478,484 ----
           /*Additionally supply a list of constants with values of that
              type.*/
           void *context;
!          osbool first = TRUE;
  
           context = NULL;
           while (TRUE)
***************
*** 605,611 ****
     context = 0;
     while (TRUE)
     {
!       bool nonx, first;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s, &context)) !=
              NULL)
--- 605,611 ----
     context = 0;
     while (TRUE)
     {
!       osbool nonx, first;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s, &context)) !=
              NULL)
***************
*** 820,826 ****
  
              if (!def_using_block (s))
              {
!                bool first;
                 int  i;
  
                 tracef ("inputs ...\n");
--- 820,826 ----
  
              if (!def_using_block (s))
              {
!                osbool first;
                 int  i;
  
                 tracef ("inputs ...\n");
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Def LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Def
*** LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Def Wed Feb  2 19:36:52 2000
--- LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Def     Wed May  3 17:57:22 2000
***************
*** 243,249 ****
     def_s  s
  )
  {
!    bool      first = TRUE;
     int       i, argc = 0;
     String    arg;
     lookup_t  argt;
--- 243,249 ----
     def_s  s
  )
  {
!    osbool    first = TRUE;
     int       i, argc = 0;
     String    arg;
     lookup_t  argt;
***************
*** 411,423 ****
           Rx -> .Struct (<something with no ...>)
  */
  
! bool def_using_block
  (
     def_s s
  )
  {
     int i;
!    bool got_one = FALSE;
  
     if (s->o != 0) return FALSE;
  
--- 411,423 ----
           Rx -> .Struct (<something with no ...>)
  */
  
! osbool def_using_block
  (
     def_s s
  )
  {
     int i;
!    osbool got_one = FALSE;
  
     if (s->o != 0) return FALSE;
  
***************
*** 457,463 ****
  
  /*Whether a SWI could be rendered inline by a SWI instruction.*/
  
! bool def_inlinable
  (
     def_s s
  )
--- 457,463 ----
  
  /*Whether a SWI could be rendered inline by a SWI instruction.*/
  
! osbool def_inlinable
  (
     def_s s
  )
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Hdr LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Hdr
*** LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Hdr Sun Mar  5 19:56:44 2000
--- LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Hdr     Wed May  3 17:58:36 2000
***************
*** 147,153 ****
     FILE  *file,
     def_t  t,
     char  *v,
!    bool   top_level,
     int    count
  )
  {
--- 147,153 ----
     FILE  *file,
     def_t  t,
     char  *v,
!    osbool top_level,
     int    count
  )
  {
***************
*** 486,492 ****
     void     *context;
     int       rc = 0;
     time_t    now;
!    bool      start;
  
     /*Emit the TITLE declaration.*/
     if ((rc = fprintf (file,
--- 486,492 ----
     void     *context;
     int       rc = 0;
     time_t    now;
!    osbool    start;
  
     /*Emit the TITLE declaration.*/
     if ((rc = fprintf (file,
***************
*** 626,632 ****
     while (TRUE)
     {
        char title [def_ID_LIMIT + 1] = "X";
!       bool first, titled;
        int  i;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s,
--- 626,632 ----
     while (TRUE)
     {
        char title [def_ID_LIMIT + 1] = "X";
!       osbool first, titled;
        int  i;
  
        if ((error = lookup_enumerate (swis, &swi, (void **) &s,
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Objasm LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Objasm
*** LanMan98::tony.$.OSLib.!OsLib601.Tools.DefMod.c/Objasm      Sun Apr  2 12:32:46 2000
--- LanMan98::tony.$.OSLib.!Experimental.Tools.DefMod.c/Objasm  Wed May  3 18:01:34 2000
***************
*** 111,117 ****
  }
  /*-----------------------------------------------------------------------*/
  
! static bool Set_Elem
  (
     int  n,
     bits set
--- 111,117 ----
  }
  /*-----------------------------------------------------------------------*/
  
! static osbool Set_Elem
  (
     int  n,
     bits set
***************
*** 123,129 ****
  
  /*Is type |t| 1 byte wide?*/
  
! static bool Byte_Wide
  (
     def_t t,
     lookup_t types
--- 123,129 ----
  
  /*Is type |t| 1 byte wide?*/
  
! static osbool Byte_Wide
  (
     def_t t,
     lookup_t types
***************
*** 327,333 ****
  (
     char *s0,
     bits  set,
!    bool  hat
  )
  {
     char *cc = s0;
--- 327,333 ----
  (
     char *s0,
     bits  set,
!    osbool hat
  )
  {
     char *cc = s0;
***************
*** 351,357 ****
  (
     char *s0,
     bits  set,
!    bool  hat
  )
  {
     char *cc = s0;
--- 351,357 ----
  (
     char *s0,
     bits  set,
!    osbool hat
  )
  {
     char *cc = s0;
***************
*** 376,383 ****
     FILE    *file,
     char    *swi,
     def_s    s,
!    bool     nonx,
!    bool     apcs32,
     lookup_t types
  )
  {
--- 376,383 ----
     FILE    *file,
     char    *swi,
     def_s    s,
!    osbool   nonx,
!    osbool   apcs32,
     lookup_t types
  )
  {
***************
*** 389,395 ****
                n, m, /*menials*/
                f, rc = 0;
     enum {LR_IN_IP, LR_STACKED, LR_PRESERVED} mode;
!    bool       use_block;
  
     Local = NULL;
  
--- 389,395 ----
                n, m, /*menials*/
                f, rc = 0;
     enum {LR_IN_IP, LR_STACKED, LR_PRESERVED} mode;
!    osbool       use_block;
  
     Local = NULL;
  
***************
*** 585,591 ****
              {
                 int  j, low;
                 bits k = s->constants [n];
!                bool first = TRUE, negative = Set_Count (k) > 16;
  
                 if (negative) k = ~k;
                 low = 0;
--- 585,591 ----
              {
                 int  j, low;
                 bits k = s->constants [n];
!                osbool first = TRUE, negative = Set_Count (k) > 16;
  
                 if (negative) k = ~k;
                 low = 0;
***************
*** 668,674 ****
        for (n = 0; n < no + f; n++)
        {
           int reg;
!          bool store_byte;
  
           /*Do we want a STRNE or a STRNEB?*/
           if (n != no)
--- 668,674 ----
        for (n = 0; n < no + f; n++)
        {
           int reg;
!          osbool store_byte;
  
           /*Do we want a STRNE or a STRNEB?*/
           if (n != no)
***************
*** 877,885 ****
     lookup_t  consts,
     lookup_t  types,
     lookup_t  swis,
!    bool      separate, /*if |separate|, output is to the directory |output|; otherwise,
                            to the file |file|.*/
!    bool      apcs32,
     char     *output
  )
  {
--- 877,885 ----
     lookup_t  consts,
     lookup_t  types,
     lookup_t  swis,
!    osbool    separate, /*if |separate|, output is to the directory |output|; otherwise,
                            to the file |file|.*/
!    osbool    apcs32,
     char     *output
  )
  {
***************
*** 888,894 ****
     def_s     s;
     void     *context;
     int       rc = 0;
!    bool      done_fopen_via_file = FALSE, done_fopen_object = FALSE;
     FILE     *via_file = NULL, *object = NULL /*for Norcroft*/;
  
     needs = needs, consts = consts, types = types;
--- 888,894 ----
     def_s     s;
     void     *context;
     int       rc = 0;
!    osbool    done_fopen_via_file = FALSE, done_fopen_object = FALSE;
     FILE     *via_file = NULL, *object = NULL /*for Norcroft*/;
  
     needs = needs, consts = consts, types = types;
***************
*** 1003,1009 ****
           char c_name [def_ID_LIMIT + 1],
                      c_plus_plus_name [def_C_PLUS_PLUS_LIMIT + 1],
                      dir_name [FILENAME_MAX + 1];
!          bool nonx;
  
           if ((error = lookup_enumerate (swis, &swi, (void **) &s,
                 &context)) != NULL)
--- 1003,1009 ----
           char c_name [def_ID_LIMIT + 1],
                      c_plus_plus_name [def_C_PLUS_PLUS_LIMIT + 1],
                      dir_name [FILENAME_MAX + 1];
!          osbool nonx;
  
           if ((error = lookup_enumerate (swis, &swi, (void **) &s,
                 &context)) != NULL)
