diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Support.c/callback LanMan98::tony.$.OSLib.!Experimental.Support.c/callback
*** LanMan98::tony.$.OSLib.!OsLib601.Support.c/callback Thu Feb 10 18:03:32 2000
--- LanMan98::tony.$.OSLib.!Experimental.Support.c/callback     Wed May  3 18:14:30 2000
***************
*** 215,227 ****
  (
     void  *dh,
     Level  level,
!    bool  *unclaimed,
     int    limit,
     int   *k
  )
  {
     Function  f;
!    bool      u = TRUE;
     os_error *error = NULL;
  
  #ifdef XTRACE
--- 215,227 ----
  (
     void  *dh,
     Level  level,
!    osbool  *unclaimed,
     int    limit,
     int   *k
  )
  {
     Function  f;
!    osbool    u = TRUE;
     os_error *error = NULL;
  
  #ifdef XTRACE
***************
*** 284,290 ****
  (
     callback_l  l,
     void       *dh,
!    bool       *unclaimed,
     int         limit,
     ...
  )
--- 284,290 ----
  (
     callback_l  l,
     void       *dh,
!    osbool     *unclaimed,
     int         limit,
     ...
  )
***************
*** 292,298 ****
     /*Makes the non-portable assumption that the arguments after |limit| are
        on the stack in order of increasing address.*/
  
!    bool u = TRUE;
     os_error *error = NULL;
  
     tracef ("callback ...\n");
--- 292,298 ----
     /*Makes the non-portable assumption that the arguments after |limit| are
        on the stack in order of increasing address.*/
  
!    osbool u = TRUE;
     os_error *error = NULL;
  
     tracef ("callback ...\n");
***************
*** 330,336 ****
     for (i = 0; i < limit; i++)
     {
        Entry e;
!       bool  found = FALSE;
  
        if (*level == NULL)
        {
--- 330,336 ----
     for (i = 0; i < limit; i++)
     {
        Entry e;
!       osbool found = FALSE;
  
        if (*level == NULL)
        {
***************
*** 589,595 ****
  )
  {
     Function f;
!    bool     first = TRUE;
  
     for (f = fns; f != NULL; f = f->next)
     {
--- 589,595 ----
  )
  {
     Function f;
!    osbool   first = TRUE;
  
     for (f = fns; f != NULL; f = f->next)
     {
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Support.c/resource LanMan98::tony.$.OSLib.!Experimental.Support.c/resource
*** LanMan98::tony.$.OSLib.!OsLib601.Support.c/resource Thu Feb 10 18:03:32 2000
--- LanMan98::tony.$.OSLib.!Experimental.Support.c/resource     Wed May  3 18:14:50 2000
***************
*** 42,47 ****
--- 42,48 ----
  #include <string.h>
  
  /*From OSLib*/
+ #include "types.h"
  #include "font.h"
  #include "messagetrans.h"
  #include "os.h"
***************
*** 65,71 ****
     messagetrans_control_block  cb;
     int                         size, extra_size, context;
     bits                        flags;
!    bool                        done_open_file = FALSE;
     char                       *tmp, *messages;
  
     tracef ("resource_messages_alloc\n");
--- 66,72 ----
     messagetrans_control_block  cb;
     int                         size, extra_size, context;
     bits                        flags;
!    osbool                      done_open_file = FALSE;
     char                       *tmp, *messages;
  
     tracef ("resource_messages_alloc\n");
***************
*** 124,130 ****
     while (TRUE)
     {
        char  token [255 + 1];
!       bool  cont;
        int   size;
        char *lookup;
  
--- 125,131 ----
     while (TRUE)
     {
        char  token [255 + 1];
!       osbool cont;
        int   size;
        char *lookup;
  
***************
*** 358,364 ****
  )
  {
     os_error *error = NULL;
!    bool      done_open_template = FALSE;
     char      template_name [wimp_TEMPLATE_NAME_LIMIT + 1];
     int       context;
  
--- 359,365 ----
  )
  {
     os_error *error = NULL;
!    osbool    done_open_template = FALSE;
     char      template_name [wimp_TEMPLATE_NAME_LIMIT + 1];
     int       context;
  
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Support.c/riscos LanMan98::tony.$.OSLib.!Experimental.Support.c/riscos
*** LanMan98::tony.$.OSLib.!OsLib601.Support.c/riscos   Thu Feb 10 18:03:32 2000
--- LanMan98::tony.$.OSLib.!Experimental.Support.c/riscos       Wed May  3 18:15:16 2000
***************
*** 26,31 ****
--- 26,32 ----
  #include <string.h>
  
  /*From OSLib*/
+ #include "types.h"
  #include "messagetrans.h"
  #include "macros.h"
  #include "os.h"
***************
*** 420,426 ****
     char      n [9];
     int       i;
     char     *p;
!    bool      done_start = FALSE;
     va_list   list;
  
     if ((error = xos_writec (vdu)) != NULL)
--- 421,427 ----
     char      n [9];
     int       i;
     char     *p;
!    osbool    done_start = FALSE;
     va_list   list;
  
     if ((error = xos_writec (vdu)) != NULL)
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.Support.c/trace LanMan98::tony.$.OSLib.!Experimental.Support.c/trace
*** LanMan98::tony.$.OSLib.!OsLib601.Support.c/trace    Thu Feb 10 18:03:32 2000
--- LanMan98::tony.$.OSLib.!Experimental.Support.c/trace        Wed May  3 18:15:32 2000
***************
*** 41,46 ****
--- 41,47 ----
  #include <time.h>
  
  /*From OSLib*/
+ #include "types.h"
  #include "econet.h"
  #include "macros.h"
  #include "os.h"
***************
*** 211,217 ****
  {
     va_list   list;
     char      s [TRACE_BUFFER_SIZE + 1], *cc;
!    bool      has_format = format != NULL && strlen (format) > 0;
     os_error *error = NULL;
     int       len;
  
--- 212,218 ----
  {
     va_list   list;
     char      s [TRACE_BUFFER_SIZE + 1], *cc;
!    osbool    has_format = format != NULL && strlen (format) > 0;
     os_error *error = NULL;
     int       len;
  
