X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f15c8583198c3d6c26ca0c0a5b6fb019f98d6c3c..0a2aedfe6d650e825a50f25f972bac20d669f5cb:/src/ralloc.c?ds=sidebyside
diff --git a/src/ralloc.c b/src/ralloc.c
index fb5087d406..071cee777e 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1,12 +1,12 @@
/* Block-relocating memory allocator.
- Copyright (C) 1993, 1995, 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1995, 2000-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,31 +22,15 @@ along with GNU Emacs. If not, see . */
rather than all of them. This means allowing for a possible
hole between the first bloc and the end of malloc storage. */
-#ifdef emacs
-
#include
-#include "lisp.h" /* Needed for VALBITS. */
-#include "blockinput.h"
-
-#include
-
-#ifdef DOUG_LEA_MALLOC
-#define M_TOP_PAD -2
-extern int mallopt (int, int);
-#else /* not DOUG_LEA_MALLOC */
-#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC
-extern size_t __malloc_extra_blocks;
-#endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */
-#endif /* not DOUG_LEA_MALLOC */
-
-#else /* not emacs */
-
#include
-#include
-
-#endif /* not emacs */
+#ifdef emacs
+# include "lisp.h"
+# include "blockinput.h"
+# include
+#endif
#include "getpagesize.h"
@@ -95,7 +79,9 @@ static int extra_bytes;
/* The hook `malloc' uses for the function which gets more space
from the system. */
-#if !defined SYSTEM_MALLOC && !defined HYBRID_MALLOC
+#ifdef HAVE_MALLOC_H
+# include
+#else
extern void *(*__morecore) (ptrdiff_t);
#endif