From: Ken Raeburn <raeburn@raeburn.org>
Date: Wed, 8 Mar 2017 11:28:45 +0000 (-0500)
Subject: Fix CANNOT_DUMP build on Darwin/macOS.
X-Git-Tag: emacs-26.0.90~521^2~710
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d15719d36e8fab262e7803d9409326321b890941;p=emacs.git

Fix CANNOT_DUMP build on Darwin/macOS.

* src/conf_post.h (malloc, realloc, free) [DARWIN_OS && emacs &&
CANNOT_DUMP]: Don't define as unexec_malloc, etc.
* src/emacs.c (main): Don't call unexec_init_emacs_zone.
---

diff --git a/src/conf_post.h b/src/conf_post.h
index e146b9bbe8a..30c948e39af 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -94,7 +94,7 @@ typedef bool bool_bf;
 #endif
 
 #ifdef DARWIN_OS
-#ifdef emacs
+#if defined emacs && !defined CANNOT_DUMP
 #define malloc unexec_malloc
 #define realloc unexec_realloc
 #define free unexec_free
diff --git a/src/emacs.c b/src/emacs.c
index 1868961090d..2b01a37f5ab 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -137,7 +137,7 @@ static
 bool might_dump;
 #endif
 
-#ifdef DARWIN_OS
+#if defined DARWIN_OS && !defined CANNOT_DUMP
 extern void unexec_init_emacs_zone (void);
 #endif
 
@@ -742,7 +742,7 @@ main (int argc, char **argv)
 #endif
 
 /* If using unexmacosx.c (set by s/darwin.h), we must do this. */
-#ifdef DARWIN_OS
+#if defined DARWIN_OS && !defined CANNOT_DUMP
   if (!initialized)
     unexec_init_emacs_zone ();
 #endif