-#define ADDR2UINT(addr) ((unsigned int) ((char *) (addr) - (char *) NULL))
-#define RESIDUAL(addr,bsize) ((unsigned int) (ADDR2UINT (addr) % (bsize)))
+#define ADDR2UINT(addr) ((size_t) ((char *) (addr) - (char *) NULL))
+#define RESIDUAL(addr,bsize) ((size_t) (ADDR2UINT (addr) % (bsize)))