No specific user configuration

[platform/upstream/bash.git] / xmalloc.h

diff --git a/xmalloc.h b/xmalloc.h
index 2c0a109..bea71fd 100644 (file)
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,22 +1,22 @@
 /* xmalloc.h -- defines for the `x' memory allocation functions */
 
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2009 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
-   Bash is free software; you can redistribute it and/or modify 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.
+   Bash is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bash 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.
+   Bash 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 Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   You should have received a copy of the GNU General Public License
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #if !defined (_XMALLOC_H_)
 #define _XMALLOC_H_
@@ -40,7 +40,7 @@ extern PTR_T xmalloc __P((size_t));
 extern PTR_T xrealloc __P((void *, size_t));
 extern void xfree __P((void *));
 
-#ifdef USING_BASH_MALLOC
+#if defined(USING_BASH_MALLOC) && !defined (DISABLE_MALLOC_WRAPPERS)
 extern PTR_T sh_xmalloc __P((size_t, const char *, int));
 extern PTR_T sh_xrealloc __P((void *, size_t, const char *, int));
 extern void sh_xfree __P((void *, const char *, int));