mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 07:41:28 -08:00
Code Issues Projects Releases Wiki Activity

Fix bug#18368 with broken build on AIX due to HYBRID_MALLOC changes.

Browse source 
* src/gmalloc.c: Don't include <stdlib.h>.  Declare system malloc and
friends before defining hybrid_malloc and friends if HYBRID_MALLOC
is defined.  (Bug#18368)
This commit is contained in:
Ken Brown 2014-08-30 22:40:00 -04:00
parent ced5a8f219
commit f356dedfe3
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-08-31 Ken Brown <kbrown@cornell.edu>
* gmalloc.c: Don't include <stdlib.h>. Declare system malloc and
friends before defining hybrid_malloc and friends if HYBRID_MALLOC
is defined. (Bug#18368)
2014-08-30 Paul Eggert <eggert@cs.ucla.edu>
Vector-sorting fixes (Bug#18361).

18
src/gmalloc.c
View file

@ -19,13 +19,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation. */
/* If HYBRID_MALLOC is defined in config.h, then conf_post.h #defines
malloc and friends as macros before including stdlib.h. In this
file we will need the prototypes for the system malloc, so we must
include stdlib.h before config.h. And we have to do this
unconditionally, since HYBRID_MALLOC hasn't been defined yet. */
#include <stdlib.h>
#include <config.h>
#if defined HAVE_PTHREAD && !defined HYBRID_MALLOC
@ -1725,6 +1718,17 @@ valloc (size_t size)
#undef aligned_alloc
#undef free
/* Declare system malloc and friends. */
extern void *malloc (size_t size);
extern void *realloc (void *ptr, size_t size);
extern void *calloc (size_t nmemb, size_t size);
extern void free (void *ptr);
#ifdef HAVE_ALIGNED_ALLOC
extern void *aligned_alloc (size_t alignment, size_t size);
#elif defined HAVE_POSIX_MEMALIGN
extern int posix_memalign (void **memptr, size_t alignment, size_t size);
#endif
/* See the comments near the beginning of this file for explanations
of the following functions. */