Changeset 2b3dd78 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

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

uspace/lib/c/generic/malloc.c

@@ -33 +33 @@
 /** @file
  */
-
-#define _HELENOS_SOURCE
 
 #include <malloc.h>
@@ -876 +874 @@
  *
  */
-void *realloc(const void *addr, const size_t size)
-{
+void *realloc(void * const addr, const size_t size)
+{
+        if (size == 0) {
+                free(addr);
+                return NULL;
+        }
+
         if (addr == NULL)
                 return malloc(size);
@@ -985 +988 @@
  *
  */
-void free(const void *addr)
+void free(void * const addr)
 {
         if (addr == NULL)