Changes in uspace/lib/c/generic/malloc.c [ffccdff0:25f6bddb] in mainline

File:

• uspace/lib/c/generic/malloc.c (modified) (3 diffs)

uspace/lib/c/generic/malloc.c

@@ -35 +35 @@
 
 #include <malloc.h>
-#include <stdalign.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -82 +81 @@
         (sizeof(heap_block_head_t) + sizeof(heap_block_foot_t))
 
-/** Calculate real size of a heap block.
- *
- * Add header and footer size.
- *
- */
-#define GROSS_SIZE(size)  ((size) + STRUCT_OVERHEAD)
-
-/** Calculate net size of a heap block.
- *
- * Subtract header and footer size.
- *
- */
-#define NET_SIZE(size)  ((size) - STRUCT_OVERHEAD)
-
 /** Overhead of each area. */
 #define AREA_OVERHEAD(size) \
-        (ALIGN_UP(GROSS_SIZE(size) + sizeof(heap_area_t), BASE_ALIGN))
+        (ALIGN_UP(size + sizeof(heap_area_t), BASE_ALIGN))
+
+/** Calculate real size of a heap block.
+ *
+ * Add header and footer size.
+ *
+ */
+#define GROSS_SIZE(size)  ((size) + STRUCT_OVERHEAD)
+
+/** Calculate net size of a heap block.
+ *
+ * Subtract header and footer size.
+ *
+ */
+#define NET_SIZE(size)  ((size) - STRUCT_OVERHEAD)
 
 /** Get first block in heap area.
@@ -199 +198 @@
 
 #define malloc_assert(expr) safe_assert(expr)
-
-/*
- * Make sure the base alignment is sufficient.
- */
-static_assert(BASE_ALIGN >= alignof(heap_area_t), "");
-static_assert(BASE_ALIGN >= alignof(heap_block_head_t), "");
-static_assert(BASE_ALIGN >= alignof(heap_block_foot_t), "");
-static_assert(BASE_ALIGN >= alignof(max_align_t), "");
 
 /** Serializes access to the heap from multiple threads. */