From: Fabrice Popineau <fabrice.popineau@gmail.com>
To: Ken Brown <kbrown@cornell.edu>
Cc: 17622 <17622@debbugs.gnu.org>, Katsumi Yamaoka <yamaoka@jpl.org>
Subject: bug#17622: 24.4.50; bootstrap failure
Date: Thu, 29 May 2014 16:24:12 +0200 [thread overview]
Message-ID: <CAFgFV9OfWh3pK8=RDQEMMh9R2_HxCqwj8nPgMs7zh_b=VcgFtg@mail.gmail.com> (raw)
In-Reply-To: <53874183.4070003@cornell.edu>
[-- Attachment #1: Type: text/plain, Size: 1737 bytes --]
Thanks, albeit I missed the obvious.
=== modified file 'src/buffer.c'
--- src/buffer.c 2014-05-27 17:31:17 +0000
+++ src/buffer.c 2014-05-29 14:22:37 +0000
@@ -4703,11 +4703,6 @@
static int mmap_fd;
-/* Temporary storage for mmap_set_vars, see there. */
-
-static struct mmap_region *mmap_regions_1;
-static int mmap_fd_1;
-
/* Page size on this system. */
static int mmap_page_size;
@@ -5282,6 +5277,10 @@
{
struct buffer *b;
+#ifndef WINDOWSNT
+ mmap_regions = NULL;
+ mmap_fd = -1;
+#endif
/* We cannot dump buffers with meaningful addresses that can be
used by the dumped Emacs. We map new memory for them here. */
FOR_EACH_BUFFER (b)
Fabrice
2014-05-29 16:17 GMT+02:00 Ken Brown <kbrown@cornell.edu>:
> On 5/29/2014 9:54 AM, Fabrice Popineau wrote:
>
>> This should fix the problem:
>>
>> --- ../trunk/src/buffer.c 2014-05-29 15:51:11.632003900 +0200
>> +++ src/buffer.c 2014-05-29 15:50:54.192190300 +0200
>> @@ -4703,11 +4703,6 @@
>>
>> static int mmap_fd;
>>
>> -/* Temporary storage for mmap_set_vars, see there. */
>> -
>> -static struct mmap_region *mmap_regions_1;
>> -static int mmap_fd_1;
>> -
>> /* Page size on this system. */
>>
>> static int mmap_page_size;
>> @@ -5282,6 +5277,9 @@
>> {
>> struct buffer *b;
>>
>> + mmap_regions = NULL;
>> + mmap_fd = -1;
>> +
>> /* We cannot dump buffers with meaningful addresses that can be
>> used by the dumped Emacs. We map new memory for them here. */
>> FOR_EACH_BUFFER (b)
>>
>> by initializing explicitly variables that need it. We can also remove
>> unsused variables.
>> Waiting for confirmation (or failure!).
>>
>
> Confirmed. Thanks.
>
> Ken
>
>
[-- Attachment #2: Type: text/html, Size: 2731 bytes --]
next prev parent reply other threads:[~2014-05-29 14:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-28 23:45 bug#17622: 24.4.50; bootstrap failure Katsumi Yamaoka
2014-05-29 2:02 ` Katsumi Yamaoka
2014-05-29 4:56 ` Katsumi Yamaoka
2014-05-29 12:38 ` Ken Brown
2014-05-29 12:55 ` Fabrice Popineau
2014-05-29 13:29 ` Ken Brown
2014-05-29 13:54 ` Fabrice Popineau
2014-05-29 14:17 ` Ken Brown
2014-05-29 14:24 ` Fabrice Popineau [this message]
2014-05-29 15:12 ` Eli Zaretskii
2014-05-29 16:44 ` Fabrice Popineau
2014-05-29 22:52 ` Katsumi Yamaoka
2014-05-29 15:09 ` Eli Zaretskii
2014-05-29 15:08 ` Eli Zaretskii
2014-05-29 14:59 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFgFV9OfWh3pK8=RDQEMMh9R2_HxCqwj8nPgMs7zh_b=VcgFtg@mail.gmail.com' \
--to=fabrice.popineau@gmail.com \
--cc=17622@debbugs.gnu.org \
--cc=kbrown@cornell.edu \
--cc=yamaoka@jpl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.