Index: lwip/src/core/mem.c
===================================================================
RCS file: /home/ianw/cvs/lwip/lwip/src/core/mem.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- lwip/src/core/mem.c	4 Feb 2004 01:40:42 -0000	1.1.1.1
+++ lwip/src/core/mem.c	4 Feb 2004 02:21:34 -0000	1.2
@@ -292,7 +292,7 @@
       }
       sys_sem_signal(mem_sem);
       LWIP_ASSERT("mem_malloc: allocated memory not above ram_end.",
-       (u32_t)mem + SIZEOF_STRUCT_MEM + size <= (u32_t)ram_end);
+       (mem_ptr_t)mem + SIZEOF_STRUCT_MEM + size <= (mem_ptr_t)ram_end);
       LWIP_ASSERT("mem_malloc: allocated memory properly aligned.",
        (unsigned long)((u8_t *)mem + SIZEOF_STRUCT_MEM) % MEM_ALIGNMENT == 0);
       return (u8_t *)mem + SIZEOF_STRUCT_MEM;
Index: lwip/src/core/memp.c
===================================================================
RCS file: /home/ianw/cvs/lwip/lwip/src/core/memp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- lwip/src/core/memp.c	4 Feb 2004 01:40:42 -0000	1.1.1.1
+++ lwip/src/core/memp.c	4 Feb 2004 02:21:34 -0000	1.2
@@ -217,7 +217,7 @@
     sys_sem_signal(mutex);
 #endif /* SYS_LIGHTWEIGHT_PROT */  
     LWIP_ASSERT("memp_malloc: memp properly aligned",
-     ((u32_t)MEM_ALIGN((u8_t *)memp + sizeof(struct memp)) % MEM_ALIGNMENT) == 0);
+     ((mem_ptr_t)MEM_ALIGN((u8_t *)memp + sizeof(struct memp)) % MEM_ALIGNMENT) == 0);
 
     mem = MEM_ALIGN((u8_t *)memp + sizeof(struct memp));
     return mem;
Index: lwip/src/core/pbuf.c
===================================================================
RCS file: /home/ianw/cvs/lwip/lwip/src/core/pbuf.c,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- lwip/src/core/pbuf.c	4 Feb 2004 01:40:42 -0000	1.1
+++ lwip/src/core/pbuf.c	4 Feb 2004 03:11:46 -0000	1.3
@@ -100,7 +100,7 @@
   u16_t i;
 
   pbuf_pool = (struct pbuf *)&pbuf_pool_memory[0];
-  LWIP_ASSERT("pbuf_init: pool aligned", (long)pbuf_pool % MEM_ALIGNMENT == 0);
+  LWIP_ASSERT("pbuf_init: pool aligned", (mem_ptr_t)pbuf_pool % MEM_ALIGNMENT == 0);
 
 #if PBUF_STATS
   lwip_stats.pbuf.avail = PBUF_POOL_SIZE;
@@ -254,7 +254,7 @@
     /* make the payload pointer point 'offset' bytes into pbuf data memory */
     p->payload = MEM_ALIGN((void *)((u8_t *)p + (sizeof(struct pbuf) + offset)));
     LWIP_ASSERT("pbuf_alloc: pbuf p->payload properly aligned",
-            ((u32_t)p->payload % MEM_ALIGNMENT) == 0);
+            ((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0);
     /* the total length of the pbuf chain is the requested size */
     p->tot_len = length;
     /* set the length of the first pbuf in the chain */
@@ -290,7 +290,7 @@
       q->len = rem_len > PBUF_POOL_BUFSIZE? PBUF_POOL_BUFSIZE: rem_len;
       q->payload = (void *)((u8_t *)q + sizeof(struct pbuf));
       LWIP_ASSERT("pbuf_alloc: pbuf q->payload properly aligned",
-              ((u32_t)q->payload % MEM_ALIGNMENT) == 0);
+              ((mem_ptr_t)q->payload % MEM_ALIGNMENT) == 0);
       q->ref = 1;
       /* calculate remaining length to be allocated */
       rem_len -= q->len;
@@ -314,7 +314,7 @@
     p->flags = PBUF_FLAG_RAM;
 
     LWIP_ASSERT("pbuf_alloc: pbuf->payload properly aligned",
-           ((u32_t)p->payload % MEM_ALIGNMENT) == 0);
+           ((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0);
     break;
   /* pbuf references existing (static constant) ROM payload? */
   case PBUF_ROM: