diff options
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/alloc.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index af0589257d8..52862bfb446 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | 2014-08-09 Reuben Thomas <rrt@sc3d.org> | 1 | 2014-08-09 Reuben Thomas <rrt@sc3d.org> |
| 2 | 2 | ||
| 3 | * alloc.c (Fmemory_info): Remove a stray brace. | ||
| 3 | * process.c: Fix a comment typo. | 4 | * process.c: Fix a comment typo. |
| 4 | * msdos.c: | 5 | * msdos.c: |
| 5 | * dosfns.c (init_dosfns): Remove support for DJGPP < 2.02. | 6 | * dosfns.c (init_dosfns): Remove support for DJGPP < 2.02. |
diff --git a/src/alloc.c b/src/alloc.c index a8ad44491fa..ac154b587e6 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6915,7 +6915,6 @@ or memory information can't be obtained, return nil. */) | |||
| 6915 | (uintmax_t) freeswap / 1024); | 6915 | (uintmax_t) freeswap / 1024); |
| 6916 | else | 6916 | else |
| 6917 | return Qnil; | 6917 | return Qnil; |
| 6918 | } | ||
| 6919 | #else /* not HAVE_LINUX_SYSINFO, not WINDOWSNT, not MSDOS */ | 6918 | #else /* not HAVE_LINUX_SYSINFO, not WINDOWSNT, not MSDOS */ |
| 6920 | /* FIXME: add more systems. */ | 6919 | /* FIXME: add more systems. */ |
| 6921 | return Qnil; | 6920 | return Qnil; |