From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Apr 2012 01:22:25 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/fda8c8fa718a63e4f8106ed628978fed72837c13?hp=-c

Merge from trunk.
---

fda8c8fa718a63e4f8106ed628978fed72837c13
diff --combined src/ChangeLog
index 6819259c96,06ae5016cf..98d9906824
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,5 -1,11 +1,11 @@@
  2012-04-16  Paul Eggert  <eggert@cs.ucla.edu>
  
+ 	Fix minor ralloc.c problems found by static checking.
+ 	See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
+ 	* ralloc.c (ALIGNED, ROUND_TO_PAGE, HEAP_PTR_SIZE)
+ 	(r_alloc_size_in_use, r_alloc_freeze, r_alloc_thaw): Remove; unused.
+ 	(r_alloc_sbrk): Now static.
+ 
  	Improve ralloc.c interface checking.
  	See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
  	* buffer.c (ralloc_reset_variable, r_alloc, r_re_alloc)
@@@ -24,19 -30,6 +30,19 @@@
  	aligned_Lisp_Misc instead of union Lisp_Misc.
  	(Fmake_symbol, allocate_misc, gc_sweep): Adjust
  
 +2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	configure: new option --enable-gcc-warnings (Bug#11207)
 +	* Makefile.in (C_WARNINGS_SWITCH): Remove.
 +	(WARN_CFLAGS, WERROR_CFLAGS): New macros.
 +	(ALL_CFLAGS): Use new macros rather than old.
 +	* process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
 +	* regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
 +	-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
 +	-Wunused-result, -Wunused-variable.  This should go away once
 +	the Emacs and Gnulib regex code is merged.
 +	(xmalloc, xrealloc): Now static.
 +
  2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
  
  	Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).