add new function : xbt_dict_is_empty

[simgrid.git] / src / xbt / mmalloc / mcalloc.c

diff --git a/src/xbt/mmalloc/mcalloc.c b/src/xbt/mmalloc/mcalloc.c
index c9fcc07..92f7eb1 100644 (file)
--- a/src/xbt/mmalloc/mcalloc.c
+++ b/src/xbt/mmalloc/mcalloc.c
@@ -1,20 +1,11 @@
 /* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   This file was then part of the GNU C Library. */
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
-The GNU C Library 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <sys/types.h>  /* GCC on HP/UX needs this before string.h. */
 #include <string.h>    /* Prototypes for memcpy, memmove, memset, etc */
@@ -24,13 +15,10 @@ Boston, MA 02111-1307, USA.  */
 /* Allocate an array of NMEMB elements each SIZE bytes long.
    The entire array is initialized to zeros.  */
 
-PTR
-mcalloc (md, nmemb, size)
-  PTR md;
-  register size_t nmemb;
-  register size_t size;
+void *
+mcalloc (void *md, register size_t nmemb, register size_t size)
 {
-  register PTR result;
+  register void* result;
 
   if ((result = mmalloc (md, nmemb * size)) != NULL)
     {
@@ -38,17 +26,3 @@ mcalloc (md, nmemb, size)
     }
   return (result);
 }
-
-/* When using this package, provide a version of malloc/realloc/free built
-   on top of it, so that if we use the default sbrk() region we will not
-   collide with another malloc package trying to do the same thing, if
-   the application contains any "hidden" calls to malloc/realloc/free (such
-   as inside a system library). */
-
-PTR
-calloc (nmemb, size)
-  size_t nmemb;
-  size_t size;
-{
-  return (mcalloc ((PTR) NULL, nmemb, size));
-}