Changes in uspace/lib/c/generic/malloc.c [b7fd2a0:582a0b8] in mainline

File:

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

uspace/lib/c/generic/malloc.c

@@ -33 +33 @@
 /** @file
  */
-
-#define _HELENOS_SOURCE
 
 #include <malloc.h>
@@ -198 +196 @@
 static futex_t malloc_futex = FUTEX_INITIALIZER;
 
-#define malloc_assert(expr) safe_assert(expr)
+#ifndef NDEBUG
+
+#define malloc_assert(expr) \
+        do { \
+                if (!(expr)) {\
+                        heap_unlock(); \
+                        assert_abort(#expr, __FILE__, __LINE__); \
+                } \
+        } while (0)
+
+#else /* NDEBUG */
+
+#define malloc_assert(expr)
+
+#endif /* NDEBUG */
+
 
 #ifdef FUTEX_UPGRADABLE
@@ -398 +411 @@
         
         /* Resize the address space area */
-        errno_t ret = as_area_resize(area->start, asize, 0);
+        int ret = as_area_resize(area->start, asize, 0);
         if (ret != EOK)
                 return false;
@@ -491 +504 @@
                         
                         /* Resize the address space area */
-                        errno_t ret = as_area_resize(area->start, asize, 0);
+                        int ret = as_area_resize(area->start, asize, 0);
                         if (ret != EOK)
                                 abort();