diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-07-06 23:18:58 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-07-06 23:18:58 -0600 |
| commit | 6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch) | |
| tree | f5f331ea361ba0f99e0f9b638d183ad492a7da31 /src/ralloc.c | |
| parent | 0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff) | |
| parent | 219afb88d9d484393418820d1c08dc93299110ec (diff) | |
| download | emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz | |
merge from trunk
this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
Diffstat (limited to 'src/ralloc.c')
| -rw-r--r-- | src/ralloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ralloc.c b/src/ralloc.c index 13fd65cbb0c..5f25ef2c320 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -43,8 +43,6 @@ extern size_t __malloc_extra_blocks; #else /* not emacs */ #include <stddef.h> - -#include <unistd.h> #include <malloc.h> #endif /* not emacs */ |