Re: master 2c8b09b06e7: Fix crash on Windows 9X

[Po Lu]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Po Lu <luangruo@yahoo.com>
>> Cc: monnier@iro.umontreal.ca,  emacs-devel@gnu.org
>> Date: Wed, 07 Dec 2022 08:58:06 +0800
>> 
>> Eli Zaretskii <eliz@gnu.org> writes:
>> 
>> > It might, so I'd prefer not to risk such duplicate calls.  It should be 
>> > easy
>> > to make sure it is called only once when dumping for unexec, and only once
>> > in the pdumper build (both when dumping and when not dumping).
>> 
>> Something like this?
>
> Without the "if (!initialized)" part, since in the pdumper build we
> want it invoked both when dumping and when starting after dumping.

So, just like this?  Thanks; now comes the question of how to install
this on the release branch without causing conflicts with master, as
part of the change is already on master.

diff --git a/src/emacs.c b/src/emacs.c
index d8a2863fd9c..2d924da1cdb 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1937,7 +1937,9 @@ main (int argc, char **argv)
     }
 
   init_alloc ();
+#ifndef HAVE_UNEXEC
   init_bignum ();
+#endif
   init_threads ();
   init_eval ();
   running_asynch_code = 0;