bug#17622: 24.4.50; bootstrap failure

[Fabrice Popineau]

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