diff -c -t LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/messagetrans LanMan98::tony.$.OSLib.!Experimental.SWILib.h/messagetrans
*** LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/messagetrans      Thu Feb 10 18:23:08 2000
--- LanMan98::tony.$.OSLib.!Experimental.SWILib.h/messagetrans  Wed May  3 17:20:24 2000
***************
*** 67,73 ****
           _OUT (2) | _OUT (3) | _OUT (4), \
           (messagetrans_control_block *) (cb), (char *) (token), \
           (char *) (buffer), (int) (size), (int) (index), \
!          (bool *) (cont), (int *) (size_out), (int *) (index_out))
  
  #define xmessagetrans_error_lookup(error, cb, buffer, size_in, arg0, arg1, \
        arg2, arg3) \
--- 67,73 ----
           _OUT (2) | _OUT (3) | _OUT (4), \
           (messagetrans_control_block *) (cb), (char *) (token), \
           (char *) (buffer), (int) (size), (int) (index), \
!          (osbool *) (cont), (int *) (size_out), (int *) (index_out))
  
  #define xmessagetrans_error_lookup(error, cb, buffer, size_in, arg0, arg1, \
        arg2, arg3) \
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/osspriteop LanMan98::tony.$.OSLib.!Experimental.SWILib.h/osspriteop
*** LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/osspriteop        Thu Feb 10 18:23:08 2000
--- LanMan98::tony.$.OSLib.!Experimental.SWILib.h/osspriteop    Wed May  3 17:22:24 2000
***************
*** 21,26 ****
--- 21,30 ----
     Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, U S A.
  */
  
+ #if !defined types_H
+    #include "types.h"
+ #endif
+ 
  #ifndef os_H
     #include "os.h"
  #endif
***************
*** 95,101 ****
  
  #define xosspriteop_screen_save(file_name, palette_flag) \
     _swix (OS_SpriteOp, _IN (0) | _IN (2) | _IN (3), \
!          OSSpriteOp_ScreenSave, (char *) (file_name), (bool) (palette_flag))
  
  #define xosspriteop_screen_load() ...
  
--- 99,105 ----
  
  #define xosspriteop_screen_save(file_name, palette_flag) \
     _swix (OS_SpriteOp, _IN (0) | _IN (2) | _IN (3), \
!          OSSpriteOp_ScreenSave, (char *) (file_name), (osbool) (palette_flag))
  
  #define xosspriteop_screen_load() ...
  
***************
*** 171,177 ****
           _IN (0) | _IN (1) | _IN (2) | _OUT (3) | _OUT (4) | _OUT (5) | \
           _OUT (6), \
           OSSpriteOp_ReadSpriteSize | (int) (bits), (osspriteop_area *) (area), \
!          (void *) (ptr), (int *) (width), (int *) (height), (bool *) (mask), \
           (int *) (mode))
  
  #define xosspriteop_read_pixel_colour(bits, area, ptr, x, y, colour, tint) \
--- 175,181 ----
           _IN (0) | _IN (1) | _IN (2) | _OUT (3) | _OUT (4) | _OUT (5) | \
           _OUT (6), \
           OSSpriteOp_ReadSpriteSize | (int) (bits), (osspriteop_area *) (area), \
!          (void *) (ptr), (int *) (width), (int *) (height), (osbool *) (mask), \
           (int *) (mode))
  
  #define xosspriteop_read_pixel_colour(bits, area, ptr, x, y, colour, tint) \
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/taskwindow LanMan98::tony.$.OSLib.!Experimental.SWILib.h/taskwindow
*** LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/taskwindow        Thu Feb 10 18:23:08 2000
--- LanMan98::tony.$.OSLib.!Experimental.SWILib.h/taskwindow    Wed May  3 17:24:20 2000
***************
*** 24,29 ****
--- 24,33 ----
     Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, U S A.
  */
  
+ #if !defined types_H
+    #include "types.h"
+ #endif
+ 
  #ifndef os_H
     #include "os.h"
  #endif
***************
*** 49,55 ****
  
  #define xtaskwindowtaskinfo_window_task(window_task) \
     _swix (TaskWindow_TaskInfo, _IN (0) | _OUT (0), \
!          TaskWindowTaskInfo_WindowTask, (bool *) (window_task))
  
  #define xtaskwindowtaskinfo_window_task_parent(parent, txt) \
     _swix (TaskWindow_TaskInfo, _IN (0) | _OUT (0) | _OUT (1), \
--- 53,59 ----
  
  #define xtaskwindowtaskinfo_window_task(window_task) \
     _swix (TaskWindow_TaskInfo, _IN (0) | _OUT (0), \
!          TaskWindowTaskInfo_WindowTask, (osbool *) (window_task))
  
  #define xtaskwindowtaskinfo_window_task_parent(parent, txt) \
     _swix (TaskWindow_TaskInfo, _IN (0) | _OUT (0) | _OUT (1), \
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/types LanMan98::tony.$.OSLib.!Experimental.SWILib.h/types
*** LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/types     Thu Feb 10 18:23:08 2000
--- LanMan98::tony.$.OSLib.!Experimental.SWILib.h/types Wed May  3 17:26:58 2000
***************
*** 24,38 ****
  #include <kernel.h>
  
  typedef unsigned int bits, bytes;
! typedef int bool;
  typedef unsigned char byte;
  
  #ifndef NULL
     #define NULL ((void *) 0)
  #endif
  
! #define FALSE ((bool) 0)
! #define TRUE  ((bool) 1)
  
  #define NONE ((bits) 0)
  #define ALL  (~(bits) 0)
--- 24,38 ----
  #include <kernel.h>
  
  typedef unsigned int bits, bytes;
! typedef int osbool;
  typedef unsigned char byte;
  
  #ifndef NULL
     #define NULL ((void *) 0)
  #endif
  
! #define FALSE ((osbool) 0)
! #define TRUE  ((osbool) 1)
  
  #define NONE ((bits) 0)
  #define ALL  (~(bits) 0)
diff -c -t LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/wimp LanMan98::tony.$.OSLib.!Experimental.SWILib.h/wimp
*** LanMan98::tony.$.OSLib.!OsLib601.SWILib.h/wimp      Thu Feb 10 18:23:08 2000
--- LanMan98::tony.$.OSLib.!Experimental.SWILib.h/wimp  Wed May  3 17:27:34 2000
***************
*** 968,974 ****
  
  #define xwimp_claim_free_memory(claim, size, avail, addr) \
     _swix (Wimp_ClaimFreeMemory, _INN (0) | _IN (1) | _OUT (1) | _OUT (2), \
!          (bool) (claim), (int) (size), (int *) (avail), (void **) (addr))
  
  #define xwimp_command_window(op) \
     _swix (Wimp_CommandWindow, _IN (0), op)
--- 968,974 ----
  
  #define xwimp_claim_free_memory(claim, size, avail, addr) \
     _swix (Wimp_ClaimFreeMemory, _INN (0) | _IN (1) | _OUT (1) | _OUT (2), \
!          (osbool) (claim), (int) (size), (int *) (avail), (void **) (addr))
  
  #define xwimp_command_window(op) \
     _swix (Wimp_CommandWindow, _IN (0), op)
***************
*** 989,995 ****
  
  #define xwimp_get_menu_state(given_icon, buffer, w, i) \
     _swix (Wimp_GetMenuState, _IN (0) | _IN (1) | _IN (2) | _IN (3), \
!       (bool) (given_icon), (char *) (buffer), (wimp_w) (w), (wimp_i) (i))
  
  #define xwimp_register_filter(type, filter, handle) \
     _swix (Wimp_RegisterFilter, _IN (0) | _IN (1) | _IN (2), \
--- 989,995 ----
  
  #define xwimp_get_menu_state(given_icon, buffer, w, i) \
     _swix (Wimp_GetMenuState, _IN (0) | _IN (1) | _IN (2) | _IN (3), \
!       (osbool) (given_icon), (char *) (buffer), (wimp_w) (w), (wimp_i) (i))
  
  #define xwimp_register_filter(type, filter, handle) \
     _swix (Wimp_RegisterFilter, _IN (0) | _IN (1) | _IN (2), \
