Changes in uspace/lib/c/generic/malloc.c [582a0b8:b7fd2a0] 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>
@@ -196 +198 @@
 static futex_t malloc_futex = FUTEX_INITIALIZER;
 
-#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 */
-
+#define malloc_assert(expr) safe_assert(expr)
 
 #ifdef FUTEX_UPGRADABLE
@@ -411 +398 @@
         
         /* Resize the address space area */
-        int ret = as_area_resize(area->start, asize, 0);
+        errno_t ret = as_area_resize(area->start, asize, 0);
         if (ret != EOK)
                 return false;
@@ -504 +491 @@
                         
                         /* Resize the address space area */
-                        int ret = as_area_resize(area->start, asize, 0);
+                        errno_t ret = as_area_resize(area->start, asize, 0);
                         if (ret != EOK)
                                 abort();