summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2019-02-10 17:10:04 +0200
committerEli Zaretskii <eliz@gnu.org>2019-02-10 17:10:04 +0200
commit24695e8977c3d048e60d1fe3714b789567c2213c (patch)
tree7f39460ecdca5abf6a0745b2cd886dd3047a3790
parentb78363eb0f51126b2c22d26ea1b91f6e4569e167 (diff)
downloademacs-24695e8977c3d048e60d1fe3714b789567c2213c.tar.gz
Unbreak the Cygw32 build
* src/emacs.c (main) [HAVE_NTGUI]: Remove code that is only for WINDOWSNT or condition it on WINDOWSNT. (Bug#34409)
-rw-r--r--src/emacs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 3f964a16041..e16e230b4ac 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -912,7 +912,7 @@ main (int argc, char **argv)
gflags.will_not_unexec_ = true;
#endif
-#if defined WINDOWSNT || defined HAVE_NTGUI
+#ifdef WINDOWSNT
/* Grab our malloc arena space now, before anything important
happens. This relies on the static heap being needed only in
temacs and only if we are going to dump with unexec. */
@@ -934,6 +934,8 @@ main (int argc, char **argv)
}
}
init_heap (use_dynamic_heap);
+#endif
+#if defined WINDOWSNT || defined HAVE_NTGUI
/* Set global variables used to detect Windows version. Do this as
early as possible. (w32proc.c calls this function as well, but
the additional call here is harmless.) */