--- contrib-20040122-orig/ports/unix/include/arch/cc.h	2003-05-08 18:52:59.000000000 +1000
+++ contrib-20040122/ports/unix/include/arch/cc.h	2004-02-03 14:48:47.820105157 +1100
@@ -34,6 +34,7 @@
 
 /* Include some files for defining library routines */
 #include <string.h>
+#include <stdint.h>
 
 /* Define platform endianness */
 #ifndef BYTE_ORDER
@@ -41,14 +42,14 @@
 #endif /* BYTE_ORDER */
 
 /* Define generic types used in lwIP */
-typedef unsigned   char    u8_t;
-typedef signed     char    s8_t;
-typedef unsigned   short   u16_t;
-typedef signed     short   s16_t;
-typedef unsigned   long    u32_t;
-typedef signed     long    s32_t;
+typedef uint8_t    u8_t;
+typedef int8_t     s8_t;
+typedef uint16_t   u16_t;
+typedef int16_t    s16_t;
+typedef uint32_t   u32_t;
+typedef int32_t    s32_t;
 
-typedef u32_t mem_ptr_t;
+typedef uintptr_t mem_ptr_t;
 
 /* Compiler hints for packing structures */
 #define PACK_STRUCT_FIELD(x) x __attribute__((packed))