[Emacs-diffs] /srv/bzr/emacs/trunk r106359: Allow building temacs with a larger heap on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106359
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-12 14:11:54 +0200
message:
  Allow building temacs with a larger heap on MS-Windows.
  
   src/makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
   with user-defined heap size.  Bump the default size of the temacs
   heap to 27MB, to avoid memory warning when running temacs.
   ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
modified:
  src/ChangeLog
  src/makefile.w32-in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-12 11:56:57 +0000
+++ b/src/ChangeLog     2011-11-12 12:11:54 +0000
@@ -1,5 +1,10 @@
 2011-11-12  Eli Zaretskii  <address@hidden>
 
+       * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
+       with user-defined heap size.  Bump the default size of the temacs
+       heap to 27MB, to avoid memory warning when running temacs.
+       ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
+
        * dispnew.c (scrolling_window): Fix incorrect indices in accessing
        current_matrix and desired_matrix.  (Bug#9990)
        (verify_row_hash) [XASSERTS]: New function.

=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in       2011-11-05 22:55:08 +0000
+++ b/src/makefile.w32-in       2011-11-12 12:11:54 +0000
@@ -24,6 +24,9 @@
 # Set EMACSLOADPATH correctly (in case already defined in environment).
 EMACSLOADPATH=$(CURDIR)/../lisp
 
+# Size in MBs of the static heap in temacs.exe.
+HEAPSIZE = 27
+
 #
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
@@ -177,7 +180,7 @@
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
                  ../nt/$(BLD)/addsection.exe $(GNULIB)
        $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) 
$(LIBS)
-       "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 
21
+       "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 
$(HEAPSIZE)
 
 # These omit firstfile.${O}, but there's no documentation in there
 # anyways.