Mercurial > emacs
comparison src/alloc.c @ 83653:2a69b973fae2
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 21 Aug 2007 04:55:30 +0000 |
| parents | 65663fcd2caa 9bb857c2b902 |
| children | afb5f262aced |
comparison
equal
deleted
inserted
replaced
| 83652:5b644ae74c91 | 83653:2a69b973fae2 |
|---|---|
| 264 (rather than bss space). That way unexec will remap it into text | 264 (rather than bss space). That way unexec will remap it into text |
| 265 space (pure), on some systems. We have not implemented the | 265 space (pure), on some systems. We have not implemented the |
| 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 */ |
| 273 | 273 |
| 274 #define pure PURE_SEG_BITS /* Use shared memory segment */ | 274 #define pure PURE_SEG_BITS /* Use shared memory segment */ |