When cross-compiling, assume memcmp works if it is declared.

[gnulib.git] / lib / calloc.c

diff --git a/lib/calloc.c b/lib/calloc.c
index 0b92d2f..554a58d 100644 (file)
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -2,10 +2,10 @@
    This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it 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.
+   the Free Software Foundation; either version 3 of the License, 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
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* written by Jim Meyering and Bruno Haible */
 
 
 /* written by Jim Meyering and Bruno Haible */
 


@@ -30,6 +29,9 @@
 
 #include <errno.h>
 
 
 #include <errno.h>
 

+/* Call the system's calloc below.  */
+#undef calloc
+

 /* Allocate and zero-fill an NxS-byte block of memory from the heap.
    If N or S is zero, allocate and zero-fill a 1-byte block.  */
 
 /* Allocate and zero-fill an NxS-byte block of memory from the heap.
    If N or S is zero, allocate and zero-fill a 1-byte block.  */