update .gitignore for developers

[thirdparty/bash.git] / xmalloc.c

diff --git a/xmalloc.c b/xmalloc.c
index 2344d2d54ec62edfe13b4549aa09d48cc8bfb748..b32c0685fe0209fc27a4999f781bc8bfdf0b71e8 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- safe versions of malloc and realloc */
 
-/* Copyright (C) 1991-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the GNU Bourne Again SHell.
 
@@ -61,7 +61,7 @@ static size_t allocated;
 /*                                                                 */
 /* **************************************************************** */
 
-#if defined (HAVE_SBRK)
+#if defined (HAVE_SBRK) && defined (USING_BASH_MALLOC)
 #define FINDBRK() \
 do { \
   if (brkfound == 0) \
@@ -86,7 +86,7 @@ allocerr (func, bytes)
      const char *func;
      size_t bytes;
 {
-#if defined (HAVE_SBRK)
+#if defined (HAVE_SBRK) && defined (USING_BASH_MALLOC)
       allocated = findbrk ();
       fatal_error (_("%s: cannot allocate %lu bytes (%lu bytes allocated)"), func, (unsigned long)bytes, (unsigned long)allocated);
 #else