*** empty log message ***

3 files changed, 44 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index b6705f86858..1062c2365e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-14  Gerd Moellmann  <gerd@gnu.org>
+
+        * configure.in (USE_MMAP_FOR_BUFFERS): Recognize in system
+        configuration files instead of REL_ALLOC_MMAP.  Set REL_ALLOC
+        to `no' if defined.  Change result report.
+
 2000-09-08  Dave Love  <fx@gnu.org>
 
         * configure.in: Remove spurious `@'s.
diff --git a/configure b/configure
index 36d9f74064a..4d8b6504e8e 100755
--- a/configure
+++ b/configure
@@ -2324,10 +2324,10 @@ configure___ system_malloc=yes
 configure___ system_malloc=no
 #endif
 
-#ifdef REL_ALLOC_MMAP
-configure___ rel_alloc_mmap=yes
+#ifdef USE_MMAP_FOR_BUFFERS
+configure___ use_mmap_for_buffers=yes
 #else
-configure___ rel_alloc_mmap=no
+configure___ use_mmap_for_buffers=no
 #endif
 
 #ifndef C_DEBUG_SWITCH
@@ -3504,7 +3504,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -4152,7 +4152,7 @@ if test x"${REL_ALLOC}" = x; then
   REL_ALLOC=${GNU_MALLOC}
 fi
 
-
+in 
 for ac_hdr in stdlib.h unistd.h sys/stat.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -4413,8 +4413,8 @@ EOF
 
 fi
 
-if test $rel_alloc_mmap = yes; then
-  REL_ALLOC=yes
+if test $use_mmap_for_buffers = yes; then
+  REL_ALLOC=no
 fi
 
 LIBS="$libsrc_libs $LIBS"
@@ -5652,7 +5652,7 @@ else
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
-void *p = alloca(2 * sizeof(int));
+char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
 if { (eval echo configure:5659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -8859,7 +8859,7 @@ Configured for \`${canonical}'.
   What compiler should emacs be built with?               ${CC} ${CFLAGS}
   Should Emacs use the GNU version of malloc?             ${GNU_MALLOC}${GNU_MALLOC_reason}
   Should Emacs use a relocating allocator for buffers?    ${REL_ALLOC}
-  Should Emacs use mmap for the relocating allocator?     $rel_alloc_mmap
+  Should Emacs use mmap(2) for buffer allocation?         $use_mmap_for_buffers
   What window system should Emacs use?                    ${window_system}
   What toolkit should Emacs use?                          ${USE_X_TOOLKIT}"
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 087f3f2b498..d75937c30f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2000-09-14  Gerd Moellmann  <gerd@gnu.org>
+
+        * s/freebsd.h, s/irix-5.0.h, s/sol2.h, s/template.h
+        (USE_MMAP_FOR_BUFFERS): Define instead of REL_ALLOC_MMAP.
+
+        * Makefile.in (mallocobj) [SYSTEM_MALLOC]: Don't add ralloc.o.
+
+        * emacs.c: Change conditional compilation on REL_ALLOC_MMAP to
+        USE_MMAP_FOR_BUFFERS.
+
+        * insdel.c (make_gap): Use enlarge_buffer_text.
+
+        * buffer.c: Move allocation with mmap here, from ralloc.c.  Change
+        conditional compilation on REL_ALLOC_MMAP to USE_MMAP_FOR_BUFFERS.
+        (mmap_alloc, mmap_free, mmap_realloc) [REL_ALLOC_MMAP]: Renamed
+        from former r_alloc_* functions in ralloc.c.
+        (mmap_page_size, mmap_initialized_p) [REL_ALLOC_MMAP]: New
+        variables.
+        (MEM_ALIGN) [REL_ALLOC_MMAP]: New macro.
+        (mmap_init) [REL_ALLOC_MMAP]: New function.
+        (alloc_buffer_text, enlarge_buffer_text, free_buffer_text): New
+        functions replacing macros BUFFER_ALLOC, BUFFER_REALLOC, and
+        BUFFER_FREE.
+
+        * buffer.h (BUFFER_ALLOC, BUFFER_REALLOC, BUFFER_FREE): Removed.
+        (enlarge_buffer_text): Add prototype.
+
+        * ralloc.c: Remove everything having to do with the use of mmap.
+
 2000-09-13  Gerd Moellmann  <gerd@gnu.org>
 
         * sound.c (Fplay_sound): Doc fix.