[Emacs-diffs] /srv/bzr/emacs/trunk r109059: Move darwin.h's SYSTEM_PURESIZE_EXTRA setting to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109059
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 20:00:23 -0400
message:
  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.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/darwin.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-12 21:14:13 +0000
+++ b/ChangeLog 2012-07-13 00:00:23 +0000
@@ -1,5 +1,8 @@
 2012-07-12  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-12 21:14:13 +0000
+++ b/configure.ac      2012-07-13 00:00:23 +0000
@@ -4029,13 +4029,14 @@
 # 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.  */

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-12 23:56:39 +0000
+++ b/src/ChangeLog     2012-07-13 00:00:23 +0000
@@ -1,5 +1,6 @@
 2012-07-12  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/s/darwin.h'
--- a/src/s/darwin.h    2012-07-12 23:56:39 +0000
+++ b/src/s/darwin.h    2012-07-13 00:00:23 +0000
@@ -35,10 +35,6 @@
 #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