* Makefile.in, configure.in, configure,

[fw/sdcc] / device / include / malloc.h

diff --git a/device/include/malloc.h b/device/include/malloc.h
index 4a1a00ac5ec174213a5c6c7369b07ef993d2fe02..0ddf4f8c24abc95769032b8cbc38e6ba772aa22e 100644 (file)
--- a/device/include/malloc.h
+++ b/device/include/malloc.h
@@ -25,40 +25,22 @@
 #ifndef __SDCC51_MALLOC_H
 #define __SDCC51_MALLOC_H
 #include <sdcc-lib.h>
-
-#ifndef NULL
-# define NULL (void *)0
-#endif
+#include <stddef.h>
 
 #if _SDCC_MALLOC_TYPE_MLH
-void *malloc (unsigned int);
-void free(void *p);
-
-#else
 
-#define MEMHEADER   struct MAH// Memory Allocation Header
-
-MEMHEADER
-{
-      MEMHEADER xdata *  next;
-      MEMHEADER xdata *  prev;
-      unsigned int       len;
-      unsigned char      mem[1];
-};
-
-#ifdef SDCC_STACK_AUTO
-
-extern void init_dynamic_memory(MEMHEADER xdata *  , unsigned int ) reentrant;
-extern void xdata * malloc (unsigned int ) reentrant;
-extern void free (void xdata * p) reentrant;
+void * calloc (size_t nmemb, size_t size);
+void * malloc (size_t size);
+void * realloc (void * ptr, size_t size);
+void free (void * ptr);
 
 #else
 
-extern void init_dynamic_memory(MEMHEADER xdata *  , unsigned int );
-extern void xdata * malloc (unsigned int );
-extern void free (void xdata *  p);
+extern void __xdata * calloc (size_t nmemb, size_t size);
+extern void __xdata * malloc (size_t size);
+extern void __xdata * realloc (void * ptr, size_t size);
+extern void free (void * ptr);
 
-#endif
 #endif
 
 #endif