From 4fae5a7a911b82e4d1c49810650fb6b488cb5a9e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 12 Jul 2012 20:00:23 -0400 Subject: [PATCH] Move darwin.h's SYSTEM_PURESIZE_EXTRA setting to configure * configure.ac (AH_BOTTOM) [DARWIN_OS]: Move SYSTEM_PURESIZE_EXTRA setting here from src/s/darwin.h. * src/s/darwin.h (SYSTEM_PURESIZE_EXTRA): Move to configure. --- ChangeLog | 3 +++ configure.ac | 13 +++++++------ src/ChangeLog | 1 + src/s/darwin.h | 4 ---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 850eb040376..59f9981bc3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-07-12 Glenn Morris + * configure.ac (AH_BOTTOM) [DARWIN_OS]: Move SYSTEM_PURESIZE_EXTRA + setting here from src/s/darwin.h. + * configure.ac (NO_MATHERR): Unconditionally define for Darwin; as src/s/darwin.h used to. diff --git a/configure.ac b/configure.ac index 1a37f044295..24ad6b59f57 100644 --- a/configure.ac +++ b/configure.ac @@ -4029,13 +4029,14 @@ AH_BOTTOM([ # include config_opsysfile #endif -/* GNUstep needs a bit more pure memory. Of the existing knobs, - SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. - (There is probably a better place to do this, but right now the - Cocoa side does this in s/darwin.h and we cannot parallel this - exactly since GNUstep is multi-OS. */ -#if defined HAVE_NS && defined NS_IMPL_GNUSTEP +/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, + SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ +#ifdef HAVE_NS +#if defined NS_IMPL_GNUSTEP # define SYSTEM_PURESIZE_EXTRA 30000 +#elif defined DARWIN_OS +# define SYSTEM_PURESIZE_EXTRA 200000 +#endif #endif #ifdef emacs /* Don't do this for lib-src. */ diff --git a/src/ChangeLog b/src/ChangeLog index 8383cf17b03..7e75fd0ae70 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,6 @@ 2012-07-12 Glenn Morris + * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Move to configure. * process.c (init_process_emacs): Rename from init_process. The old name is also the name of a Mach system call. diff --git a/src/s/darwin.h b/src/s/darwin.h index 48f6f583d1e..9245a1b76d6 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -35,10 +35,6 @@ along with GNU Emacs. If not, see . */ #define MIN_PTY_KERNEL_VERSION '7' /* Definitions for how to compile & link. */ -#ifdef HAVE_NS -#define SYSTEM_PURESIZE_EXTRA 200000 -#endif - #ifdef emacs #define malloc unexec_malloc #define realloc unexec_realloc -- 2.39.2