Merge branch 'master' of github.com:Minep/lunaix-os

[lunaix-os.git] / lunaix-os / includes / lunaix / mm / dmm.h

diff --git a/lunaix-os/includes/lunaix/mm/dmm.h b/lunaix-os/includes/lunaix/mm/dmm.h
index 0a79cdc07ba75d7a5c4a25c5972905a84481ad6e..346c4794d9ecad2edba4358245d5e9f34cd83bec 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/dmm.h
+++ b/lunaix-os/includes/lunaix/mm/dmm.h
@@ -18,12 +18,12 @@
 
 #define PACK(size, flags) (((size) & ~0x3) | (flags))
 
 
 #define PACK(size, flags) (((size) & ~0x3) | (flags))
 

-#define SW(p, w) (*((uint32_t*)(p)) = w)
-#define LW(p) (*((uint32_t*)(p)))
+#define SW(p, w) (*((u32_t*)(p)) = w)
+#define LW(p) (*((u32_t*)(p)))

 
 

-#define HPTR(bp) ((uint32_t*)(bp)-1)
+#define HPTR(bp) ((u32_t*)(bp)-1)

 #define BPTR(bp) ((uint8_t*)(bp) + WSIZE)
 #define BPTR(bp) ((uint8_t*)(bp) + WSIZE)

-#define FPTR(hp, size) ((uint32_t*)(hp + size - WSIZE))
+#define FPTR(hp, size) ((u32_t*)(hp + size - WSIZE))

 #define NEXT_CHK(hp) ((uint8_t*)(hp) + CHUNK_S(LW(hp)))
 
 #define BOUNDARY 4
 #define NEXT_CHK(hp) ((uint8_t*)(hp) + CHUNK_S(LW(hp)))
 
 #define BOUNDARY 4