From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 25 Oct 2016 19:50:30 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1434
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a37820aef918cfaffbd1a74649e2a929f12c453b;p=emacs.git

Merge from origin/emacs-25

ee04aed Fix handling of buffer relocation in regex.c functions
71ca4f6 Avoid relocating buffers while libxml2 reads its text
1b3fc8a ; Remove redundant code in gmalloc.c
9afea93 Attempt to catch reads from a buffer that is relocated
---

a37820aef918cfaffbd1a74649e2a929f12c453b
diff --cc src/gmalloc.c
index 33d424fe9af,d2762d74e53..6ca35ec5f15
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@@ -35,27 -39,8 +35,23 @@@ License along with this library.  If no
  #include <pthread.h>
  #endif
  
- #ifdef WINDOWSNT
- #include <w32heap.h>	/* for sbrk */
- #endif
- 
  #ifdef emacs
 -extern void emacs_abort (void);
 +# include "lisp.h"
 +#endif
 +
 +#ifdef HAVE_MALLOC_H
 +# if GNUC_PREREQ (4, 2, 0)
 +#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +# endif
 +# include <malloc.h>
 +#endif
 +#ifndef __MALLOC_HOOK_VOLATILE
 +# define __MALLOC_HOOK_VOLATILE volatile
 +#endif
 +#ifndef HAVE_MALLOC_H
 +extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void);
 +extern void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void);
 +extern void *(*__morecore) (ptrdiff_t);
  #endif
  
  /* If HYBRID_MALLOC is defined, then temacs will use malloc,