diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/ralloc.c | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
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; | |||
| 43 | #else /* not emacs */ | 43 | #else /* not emacs */ |
| 44 | 44 | ||
| 45 | #include <stddef.h> | 45 | #include <stddef.h> |
| 46 | |||
| 47 | #include <unistd.h> | ||
| 48 | #include <malloc.h> | 46 | #include <malloc.h> |
| 49 | 47 | ||
| 50 | #endif /* not emacs */ | 48 | #endif /* not emacs */ |