* device/lib/pic16/configure, device/lib/pic16/configure.ac:

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

diff --git a/device/include/malloc.h b/device/include/malloc.h
index 91bfb32f8e5f450c4f537dfc1fde5f8d35b367e0..0ddf4f8c24abc95769032b8cbc38e6ba772aa22e 100644 (file)
--- a/device/include/malloc.h
+++ b/device/include/malloc.h
@@ -7,46 +7,39 @@
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 2, or (at your option) any
    later version.
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 2, or (at your option) any
    later version.

-   
+

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-   
+

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   
+

    In other words, you are welcome to use, share and improve this program.
    You are forbidden to forbid anyone else to use, share and improve
    In other words, you are welcome to use, share and improve this program.
    You are forbidden to forbid anyone else to use, share and improve

-   what you give them.   Help stamp out software-hoarding!  
+   what you give them.   Help stamp out software-hoarding!

 -------------------------------------------------------------------------*/
 /* malloc.h */
 -------------------------------------------------------------------------*/
 /* malloc.h */

-#define MEMHEADER   struct MAH// Memory Allocation Header
-

 #ifndef __SDCC51_MALLOC_H
 #define __SDCC51_MALLOC_H
 #ifndef __SDCC51_MALLOC_H
 #define __SDCC51_MALLOC_H

+#include <sdcc-lib.h>
+#include <stddef.h>

 
 

-MEMHEADER
-{
-      MEMHEADER _xdata *  next;
-      MEMHEADER _xdata *  prev;
-      unsigned int       len;
-      unsigned char      mem[1];
-};
-
-#ifdef SDCC_STACK_AUTO
-#warning Make sure you recompile malloc.c as 'reentrant'
+#if _SDCC_MALLOC_TYPE_MLH

 
 

-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
 
 
 #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