X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnu%2Fxmalloc.c;h=b9451a4c20b3d64b2a6226038a0b036adfd996a5;hb=1a44d77d50f4fb37c0410eed04b82303624ea2ec;hp=1ec5f88eee77c0e540c7fbafa1f7c1c4b4e2ef49;hpb=dda6367c9eac71da8f2ab1c60b3df60f19ce4755;p=debian%2Ftar

diff --git a/gnu/xmalloc.c b/gnu/xmalloc.c
index 1ec5f88e..b9451a4c 100644
--- a/gnu/xmalloc.c
+++ b/gnu/xmalloc.c
@@ -2,9 +2,7 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* xmalloc.c -- malloc with out of memory checking
 
-   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free Software
-   Foundation, Inc.
+   Copyright (C) 1990-2000, 2002-2006, 2008-2011 Free Software Foundation, Inc.
 
    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
@@ -33,7 +31,7 @@
 /* 1 if calloc is known to be compatible with GNU calloc.  This
    matters if we are not also using the calloc module, which defines
    HAVE_CALLOC_GNU and supports the GNU API even on non-GNU platforms.  */
-#if defined HAVE_CALLOC_GNU || defined __GLIBC__
+#if defined HAVE_CALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__)
 enum { HAVE_GNU_CALLOC = 1 };
 #else
 enum { HAVE_GNU_CALLOC = 0 };