diff options
| author | Miles Bader | 2007-08-21 04:55:30 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-21 04:55:30 +0000 |
| commit | 1fb072d1dff954c21d4805196df62c8eeead301c (patch) | |
| tree | da374db1a51e2a355b46f26a1c99e1ac5db5dca4 /src/alloc.c | |
| parent | aaf34461ff5804e5cebe163b31e535da72e81d87 (diff) | |
| parent | bdaf8a62d53cf8d5a0dc4f0dc530ecd6fc1f44fe (diff) | |
| download | emacs-1fb072d1dff954c21d4805196df62c8eeead301c.tar.gz emacs-1fb072d1dff954c21d4805196df62c8eeead301c.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 852-856)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c index 3f081491e85..8aea81a0f72 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -266,7 +266,7 @@ Lisp_Object Vmemory_full; | |||
| 266 | remapping on more recent systems because this is less important | 266 | remapping on more recent systems because this is less important |
| 267 | nowadays than in the days of small memories and timesharing. */ | 267 | nowadays than in the days of small memories and timesharing. */ |
| 268 | 268 | ||
| 269 | EMACS_INT pure[PURESIZE / sizeof (EMACS_INT)] = {1,}; | 269 | EMACS_INT pure[(PURESIZE + sizeof (EMACS_INT) - 1) / sizeof (EMACS_INT)] = {1,}; |
| 270 | #define PUREBEG (char *) pure | 270 | #define PUREBEG (char *) pure |
| 271 | 271 | ||
| 272 | #else /* HAVE_SHM */ | 272 | #else /* HAVE_SHM */ |