diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-12-17 07:56:22 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-12-17 07:56:22 -0700 |
| commit | 3d6eced1ae51ffd0a782130e7c334052277e2724 (patch) | |
| tree | 5d1d2ad7cd3374f922886c4a72062511a035c168 /src/gmalloc.c | |
| parent | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (diff) | |
| parent | 7c3d167f48d6262ee4e5512aa50a07ee96bc1509 (diff) | |
| download | emacs-3d6eced1ae51ffd0a782130e7c334052277e2724.tar.gz | |
merge from trunk
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index 78d6934755b..c325ca79910 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -36,6 +36,10 @@ Fifth Floor, Boston, MA 02110-1301, USA. #include <pthread.h> #endif +#ifdef WINDOWSNT +#include <w32heap.h> /* for sbrk */ +#endif + #ifdef __cplusplus extern "C" { @@ -460,7 +464,7 @@ get_contiguous_space (ptrdiff_t size, void *position) /* This is called when `_heapinfo' and `heapsize' have just been set to describe a new info table. Set up the table to describe itself and account for it in the statistics. */ -static inline void +static void register_heapinfo (void) { size_t block, blocks; @@ -1289,7 +1293,9 @@ Fifth Floor, Boston, MA 02110-1301, USA. The author may be reached (Email) at the address mike@ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ +#ifndef min #define min(A, B) ((A) < (B) ? (A) : (B)) +#endif /* On Cygwin the dumped emacs may try to realloc storage allocated in the static heap. We just malloc space in the new heap and copy the @@ -1639,14 +1645,6 @@ memalign (size_t alignment, size_t size) return result; } -#ifndef ENOMEM -#define ENOMEM 12 -#endif - -#ifndef EINVAL -#define EINVAL 22 -#endif - int posix_memalign (void **memptr, size_t alignment, size_t size) { |