diff -cNr Canna36p4.old/canna/protodefs.h Canna36p4.new/canna/protodefs.h
*** Canna36p4.old/canna/protodefs.h	Sun Oct 20 17:20:33 2002
--- Canna36p4.new/canna/protodefs.h	Sat Nov  8 23:09:24 2003
***************
*** 78,84 ****
  #define I16toI32(x) (x)
  #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x))
  
! #if defined(__bsdi__) || defined(__FreeBSD__)
  #include <machine/endian.h>
  #endif
  
--- 78,84 ----
  #define I16toI32(x) (x)
  #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x))
  
! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__)
  #include <machine/endian.h>
  #endif
  
diff -cNr Canna36p4.old/canna/widedef.h Canna36p4.new/canna/widedef.h
*** Canna36p4.old/canna/widedef.h	Fri Sep 12 23:32:52 2003
--- Canna36p4.new/canna/widedef.h	Sat Nov  8 23:20:15 2003
***************
*** 67,73 ****
  #endif /* HAVE_WCHAR_OPERATION */
  
  #if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
!     || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
  # ifdef _BSD_WCHAR_T_
  #  undef _BSD_WCHAR_T_
  #  ifdef WCHAR16
--- 67,73 ----
  #endif /* HAVE_WCHAR_OPERATION */
  
  #if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
!     || defined(__NetBSD__) || defined(__OpenBSD__)
  # ifdef _BSD_WCHAR_T_
  #  undef _BSD_WCHAR_T_
  #  ifdef WCHAR16
***************
*** 82,87 ****
--- 82,98 ----
  # ifdef WCHAR16
  typedef unsigned short wchar_t;
  #  define _WCHAR_T_DECLARED
+ # endif
+ # include <stddef.h>
+ # define _WCHAR_T
+ #elif defined(__APPLE__)
+ # ifdef __WCHAR_TYPE__
+ #  undef __WCHAR_TYPE__
+ # endif
+ # ifdef WCHAR16
+ #  define __WCHAR_TYPE__ unsigned short
+ # else
+ #  define __WCHAR_TYPE__ unsigned long
  # endif
  # include <stddef.h>
  # define _WCHAR_T