diff options
| author | Eli Zaretskii | 2019-02-10 17:10:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2019-02-10 17:10:04 +0200 |
| commit | 24695e8977c3d048e60d1fe3714b789567c2213c (patch) | |
| tree | 7f39460ecdca5abf6a0745b2cd886dd3047a3790 /src | |
| parent | b78363eb0f51126b2c22d26ea1b91f6e4569e167 (diff) | |
| download | emacs-24695e8977c3d048e60d1fe3714b789567c2213c.tar.gz emacs-24695e8977c3d048e60d1fe3714b789567c2213c.zip | |
Unbreak the Cygw32 build
* src/emacs.c (main) [HAVE_NTGUI]: Remove code that is only
for WINDOWSNT or condition it on WINDOWSNT. (Bug#34409)
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 4 |
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) | |||
| 912 | gflags.will_not_unexec_ = true; | 912 | gflags.will_not_unexec_ = true; |
| 913 | #endif | 913 | #endif |
| 914 | 914 | ||
| 915 | #if defined WINDOWSNT || defined HAVE_NTGUI | 915 | #ifdef WINDOWSNT |
| 916 | /* Grab our malloc arena space now, before anything important | 916 | /* Grab our malloc arena space now, before anything important |
| 917 | happens. This relies on the static heap being needed only in | 917 | happens. This relies on the static heap being needed only in |
| 918 | temacs and only if we are going to dump with unexec. */ | 918 | temacs and only if we are going to dump with unexec. */ |
| @@ -934,6 +934,8 @@ main (int argc, char **argv) | |||
| 934 | } | 934 | } |
| 935 | } | 935 | } |
| 936 | init_heap (use_dynamic_heap); | 936 | init_heap (use_dynamic_heap); |
| 937 | #endif | ||
| 938 | #if defined WINDOWSNT || defined HAVE_NTGUI | ||
| 937 | /* Set global variables used to detect Windows version. Do this as | 939 | /* Set global variables used to detect Windows version. Do this as |
| 938 | early as possible. (w32proc.c calls this function as well, but | 940 | early as possible. (w32proc.c calls this function as well, but |
| 939 | the additional call here is harmless.) */ | 941 | the additional call here is harmless.) */ |