diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-25 12:50:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-25 12:50:30 -0700 |
| commit | a37820aef918cfaffbd1a74649e2a929f12c453b (patch) | |
| tree | 6c9a005f6adcb3369d6cb344d54c8747197777e3 /src/gmalloc.c | |
| parent | 630f535ad6fbaa5e67df6fa5207e49b1728e08f9 (diff) | |
| parent | ee04aedc723b035eedaf975422d4eb242894121b (diff) | |
| download | emacs-a37820aef918cfaffbd1a74649e2a929f12c453b.tar.gz | |
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
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 33d424fe9af..6ca35ec5f15 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -35,10 +35,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. #include <pthread.h> #endif -#ifdef WINDOWSNT -#include <w32heap.h> /* for sbrk */ -#endif - #ifdef emacs # include "lisp.h" #endif |