mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-07-08 04:40:49 +02:00
Bash-5.3-alpha release
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* xmalloc.h -- defines for the `x' memory allocation functions */
|
||||
|
||||
/* Copyright (C) 2001-2020 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2001-2024 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Bash, the Bourne Again SHell.
|
||||
|
||||
@@ -26,27 +26,24 @@
|
||||
|
||||
/* Generic pointer type. */
|
||||
#ifndef PTR_T
|
||||
|
||||
#if defined (__STDC__)
|
||||
# define PTR_T void *
|
||||
#else
|
||||
# define PTR_T char *
|
||||
#endif
|
||||
|
||||
#endif /* PTR_T */
|
||||
|
||||
/* Allocation functions in xmalloc.c */
|
||||
extern PTR_T xmalloc PARAMS((size_t));
|
||||
extern PTR_T xrealloc PARAMS((void *, size_t));
|
||||
extern void xfree PARAMS((void *));
|
||||
extern PTR_T xmalloc (size_t);
|
||||
extern PTR_T xrealloc (void *, size_t);
|
||||
extern PTR_T xreallocarray (void *, size_t, size_t);
|
||||
extern void xfree (void *);
|
||||
|
||||
#if defined(USING_BASH_MALLOC) && !defined (DISABLE_MALLOC_WRAPPERS)
|
||||
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));
|
||||
extern PTR_T sh_xmalloc (size_t, const char *, int);
|
||||
extern PTR_T sh_xrealloc (void *, size_t, const char *, int);
|
||||
extern PTR_T sh_xreallocarray (void *, size_t, size_t, const char *, int);
|
||||
extern void sh_xfree (void *, const char *, int);
|
||||
|
||||
#define xmalloc(x) sh_xmalloc((x), __FILE__, __LINE__)
|
||||
#define xrealloc(x, n) sh_xrealloc((x), (n), __FILE__, __LINE__)
|
||||
#define xreallocarray(x, n, s) sh_xreallocarray((x), (n), (s), __FILE__, __LINE__)
|
||||
#define xfree(x) sh_xfree((x), __FILE__, __LINE__)
|
||||
|
||||
#ifdef free
|
||||
@@ -54,7 +51,7 @@ extern void sh_xfree PARAMS((void *, const char *, int));
|
||||
#endif
|
||||
#define free(x) sh_xfree((x), __FILE__, __LINE__)
|
||||
|
||||
extern PTR_T sh_malloc PARAMS((size_t, const char *, int));
|
||||
extern PTR_T sh_malloc (size_t, const char *, int);
|
||||
|
||||
#ifdef malloc
|
||||
#undef malloc
|
||||
|
||||
Reference in New Issue
Block a user