Merge from origin/emacs-25

[gnu-emacs] / src / lastfile.c

diff --git a/src/lastfile.c b/src/lastfile.c
index d516093b297b9d7c918b61aed68a3709d8648935..9d70b001d11d02e6cdfd7b4af95e1f34883d1124 100644 (file)
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -38,7 +38,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "lisp.h"
 
+#if ((!defined SYSTEM_MALLOC && !defined HYBRID_MALLOC) \
+     || defined WINDOWSNT || defined CYGWIN || defined DARWIN_OS)
 char my_edata[] = "End of Emacs initialized data";
+#endif
 
 /* Help unexec locate the end of the .bss area used by Emacs (which
    isn't always a separate section in NT executables).  */