[Emacs-diffs] master 24695e8: Unbreak the Cygw32 build

[Eli Zaretskii]

branch: master
commit 24695e8977c3d048e60d1fe3714b789567c2213c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Unbreak the Cygw32 build
    
    * src/emacs.c (main) [HAVE_NTGUI]: Remove code that is only
    for WINDOWSNT or condition it on WINDOWSNT.  (Bug#34409)
---
 src/emacs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/emacs.c b/src/emacs.c
index 3f964a1..e16e230 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.) */