Bash-5.1 patch 4: fix key-value pair associative array assignment word expansions

[thirdparty/bash.git] / xmalloc.h

diff --git a/xmalloc.h b/xmalloc.h
index bea71fdd6327dfcf2205115811c76e878dfbe43a..55d2e3d048ab2b4a8bec2e2b0fd0dfe641a793b1 100644 (file)
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,6 +1,6 @@
 /* xmalloc.h -- defines for the `x' memory allocation functions */
 
-/* Copyright (C) 2001-2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -36,14 +36,14 @@
 #endif /* PTR_T */
 
 /* Allocation functions in xmalloc.c */
-extern PTR_T xmalloc __P((size_t));
-extern PTR_T xrealloc __P((void *, size_t));
-extern void xfree __P((void *));
+extern PTR_T xmalloc PARAMS((size_t));
+extern PTR_T xrealloc PARAMS((void *, size_t));
+extern void xfree PARAMS((void *));
 
 #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));
+extern PTR_T sh_xmalloc PARAMS((size_t, const char *, int));
+extern PTR_T sh_xrealloc PARAMS((void *, size_t, const char *, int));
+extern void sh_xfree PARAMS((void *, const char *, int));
 
 #define xmalloc(x)     sh_xmalloc((x), __FILE__, __LINE__)
 #define xrealloc(x, n) sh_xrealloc((x), (n), __FILE__, __LINE__)
@@ -53,6 +53,14 @@ extern void sh_xfree __P((void *, const char *, int));
 #undef free
 #endif
 #define free(x)                sh_xfree((x), __FILE__, __LINE__)
+
+extern PTR_T sh_malloc PARAMS((size_t, const char *, int));
+
+#ifdef malloc
+#undef malloc
+#endif
+#define malloc(x)      sh_malloc((x), __FILE__, __LINE__)
+
 #endif /* USING_BASH_MALLOC */
 
 #endif /* _XMALLOC_H_ */